From: David S. Miller <davem@davemloft.net>
Date: Fri, 21 Nov 2014 19:53:05 +0000 (-0500)
Subject: Merge branch 'r8152-next'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c92d418f97aa2a35591601dc0b90cfc5fa8c603c;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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>
---

c92d418f97aa2a35591601dc0b90cfc5fa8c603c