Skip to content

Commit

Permalink
r8152: set RTL8152_UNPLUG when finding -ENODEV
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
hayeswang authored and David S. Miller committed Oct 30, 2014
1 parent 646697b commit 6761049
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions drivers/net/usb/r8152.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 6761049

Please sign in to comment.