r8152: set rx mode early when linking on
authorHayes Wang <hayeswang@realtek.com>
Fri, 2 Feb 2018 08:43:36 +0000 (16:43 +0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 3 Feb 2018 00:19:00 +0000 (19:19 -0500)
Set rx mode before calling netif_wake_queue() when linking on to avoid
the device missing the receiving packets.

The transmission may start after calling netif_wake_queue(), and the
packets of resopnse may reach before calling rtl8152_set_rx_mode()
which let the device could receive packets. Then, the packets of
response would be missed.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/r8152.c

index 756de9e..958b2e8 100644 (file)
@@ -3795,11 +3795,12 @@ static void set_carrier(struct r8152 *tp)
        if (speed & LINK_STATUS) {
                if (!netif_carrier_ok(netdev)) {
                        tp->rtl_ops.enable(tp);
-                       set_bit(RTL8152_SET_RX_MODE, &tp->flags);
                        netif_stop_queue(netdev);
                        napi_disable(napi);
                        netif_carrier_on(netdev);
                        rtl_start_rx(tp);
+                       clear_bit(RTL8152_SET_RX_MODE, &tp->flags);
+                       _rtl8152_set_rx_mode(netdev);
                        napi_enable(&tp->napi);
                        netif_wake_queue(netdev);
                        netif_info(tp, link, netdev, "carrier on\n");
@@ -4259,7 +4260,7 @@ static int rtl8152_post_reset(struct usb_interface *intf)
                mutex_lock(&tp->control);
                tp->rtl_ops.enable(tp);
                rtl_start_rx(tp);
-               rtl8152_set_rx_mode(netdev);
+               _rtl8152_set_rx_mode(netdev);
                mutex_unlock(&tp->control);
        }