[PATCH net-next 1/2] r8152: adjust set_carrier
From: Hayes Wang <hidden>
Date: 2014-12-19 08:57:33
Also in:
lkml
Subsystem:
networking drivers, the rest, usb networking drivers · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Update the tp->speed at the beginning of the function. Then, the other fucntion could use it for checking linking status. Signed-off-by: Hayes Wang <redacted> --- drivers/net/usb/r8152.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 2d1c77e..59b70c5 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c@@ -2848,26 +2848,25 @@ static void rtl8153_down(struct r8152 *tp) static void set_carrier(struct r8152 *tp) { struct net_device *netdev = tp->netdev; - u8 speed; + u8 old_speed = tp->speed; clear_bit(RTL8152_LINK_CHG, &tp->flags); - speed = rtl8152_get_speed(tp); + tp->speed = rtl8152_get_speed(tp); - if (speed & LINK_STATUS) { - if (!(tp->speed & LINK_STATUS)) { + if (tp->speed & LINK_STATUS) { + if (!(old_speed & LINK_STATUS)) { tp->rtl_ops.enable(tp); set_bit(RTL8152_SET_RX_MODE, &tp->flags); netif_carrier_on(netdev); } } else { - if (tp->speed & LINK_STATUS) { + if (old_speed & LINK_STATUS) { netif_carrier_off(netdev); tasklet_disable(&tp->tl); tp->rtl_ops.disable(tp); tasklet_enable(&tp->tl); } } - tp->speed = speed; } static void rtl_work_func_t(struct work_struct *work)
--
2.1.0