Merge branch 'r8152-next'
authorDavid S. Miller <davem@davemloft.net>
Mon, 12 Jan 2015 21:10:32 +0000 (16:10 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 12 Jan 2015 21:10:32 +0000 (16:10 -0500)
commit2f516d52cd07db9414dc0cd4e6f308e460b69f87
tree6e5d7fc4695dcdc621efab65ba4688ed2c19ecc7
parent3bf3947526c1053ddf2523f261395d682718f56c
parentef827a5b578c4255043a0c0032c88799fb4a774b
Merge branch 'r8152-next'

Hayes Wang says:

====================
r8152: adjust r8152_submit_rx

v2:
Replace the patch #1 with "call rtl_start_rx after netif_carrier_on".

For patch #2, replace checking tp->speed with netif_carrier_ok.

v1:
Avoid r8152_submit_rx() from submitting rx during unexpected
moment. This could reduce the time of stopping rx.

For patch #1, the tp->speed should be updated early. Then,
the patch #2 could use it to check the current linking status.
====================

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