diff options
| author | David S. Miller <davem@davemloft.net> | 2019-09-02 11:20:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-02 11:20:17 -0700 |
| commit | 765b7590c92d849806e9a27ab3a5a17cfc6a47a9 (patch) | |
| tree | 4387f5034f870accfd2bb56997c535159da45f06 /drivers/net/usb | |
| parent | 4bc61b0b16955322576265724ab0a0075a30dc84 (diff) | |
| parent | 089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
r8152 conflicts are the NAPI fixes in 'net' overlapping with
some tasklet stuff in net-next
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/r8152.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index c6fa0c17c13d..778d27d1fb15 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -4215,8 +4215,7 @@ static int rtl8152_close(struct net_device *netdev) unregister_pm_notifier(&tp->pm_notifier); #endif tasklet_disable(&tp->tx_tl); - if (!test_bit(RTL8152_UNPLUG, &tp->flags)) - napi_disable(&tp->napi); + napi_disable(&tp->napi); clear_bit(WORK_ENABLE, &tp->flags); usb_kill_urb(tp->intr_urb); cancel_delayed_work_sync(&tp->schedule); @@ -5604,7 +5603,6 @@ static int rtl8152_probe(struct usb_interface *intf, return 0; out1: - netif_napi_del(&tp->napi); tasklet_kill(&tp->tx_tl); usb_set_intfdata(intf, NULL); out: @@ -5620,7 +5618,6 @@ static void rtl8152_disconnect(struct usb_interface *intf) if (tp) { rtl_set_unplug(tp); - netif_napi_del(&tp->napi); unregister_netdev(tp->netdev); tasklet_kill(&tp->tx_tl); cancel_delayed_work_sync(&tp->hw_phy_work); |