Merge branch 'r8152-next'
authorDavid S. Miller <davem@davemloft.net>
Fri, 21 Nov 2014 19:53:05 +0000 (14:53 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 21 Nov 2014 19:53:05 +0000 (14:53 -0500)
commitc92d418f97aa2a35591601dc0b90cfc5fa8c603c
tree7e7068970167deef51d65de96ae99c1f9f6bcee8
parentf869c912869edc2754355af9e10e5aaff8ff5a40
parent7bcf4f605b4592452fba1e421b930909f7842310
Merge branch 'r8152-next'

Hayes Wang says:

====================
r8152: adjust rx functions

v3:
For patch #1, remove unnecessary initialization for ret and
unnecessary blank line in r8152_submit_rx().

v2:
For patch #1, set actual_length to 0 before adding the rx to the
list, when a error occurs.

For patch #2, change the flow. Stop submitting the rx if a error
occurs, and add the remaining rx to the list for submitting later.

v1:
Adjust some flows and codes which are relative to r8152_submit_rx()
and rtl_start_rx().
====================

Signed-off-by: David S. Miller <davem@davemloft.net>