From: David S. Miller Date: Mon, 12 Jan 2015 21:10:32 +0000 (-0500) Subject: Merge branch 'r8152-next' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2f516d52cd07db9414dc0cd4e6f308e460b69f87;p=linux-beck.git 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 --- 2f516d52cd07db9414dc0cd4e6f308e460b69f87