r8152: set RTL8152_UNPLUG when finding -ENODEV
authorhayeswang <hayeswang@realtek.com>
Thu, 30 Oct 2014 03:46:40 +0000 (11:46 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 Oct 2014 20:55:17 +0000 (16:55 -0400)
Set RTL8152_UNPLUG when finding -ENODEV. This could accelerate
unloading the driver when the device is unplugged.

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

index e1810bc386b7aa127193aa5adb0fed266971da59..f11633588a0a223da506b898b908c4ac1876918b 100644 (file)
@@ -690,6 +690,9 @@ static int generic_ocp_read(struct r8152 *tp, u16 index, u16 size,
                }
        }
 
+       if (ret == -ENODEV)
+               set_bit(RTL8152_UNPLUG, &tp->flags);
+
        return ret;
 }
 
@@ -757,6 +760,9 @@ static int generic_ocp_write(struct r8152 *tp, u16 index, u16 byteen,
        }
 
 error1:
+       if (ret == -ENODEV)
+               set_bit(RTL8152_UNPLUG, &tp->flags);
+
        return ret;
 }
 
@@ -1083,6 +1089,7 @@ static void read_bulk_callback(struct urb *urb)
 
        result = r8152_submit_rx(tp, agg, GFP_ATOMIC);
        if (result == -ENODEV) {
+               set_bit(RTL8152_UNPLUG, &tp->flags);
                netif_device_detach(tp->netdev);
        } else if (result) {
                spin_lock(&tp->rx_lock);
@@ -1187,11 +1194,13 @@ static void intr_callback(struct urb *urb)
 
 resubmit:
        res = usb_submit_urb(urb, GFP_ATOMIC);
-       if (res == -ENODEV)
+       if (res == -ENODEV) {
+               set_bit(RTL8152_UNPLUG, &tp->flags);
                netif_device_detach(tp->netdev);
-       else if (res)
+       } else if (res) {
                netif_err(tp, intr, tp->netdev,
                          "can't resubmit intr, status %d\n", res);
+       }
 }
 
 static inline void *rx_agg_align(void *data)
@@ -1755,6 +1764,7 @@ static void tx_bottom(struct r8152 *tp)
                        struct net_device *netdev = tp->netdev;
 
                        if (res == -ENODEV) {
+                               set_bit(RTL8152_UNPLUG, &tp->flags);
                                netif_device_detach(netdev);
                        } else {
                                struct net_device_stats *stats = &netdev->stats;