Re: [PATCH net v2 1/2] Revert "r8152: napi hangup fix after disconnect"
From: Jiri Slaby <hidden>
Date: 2019-08-26 08:55:35
Also in:
lkml
On 26. 08. 19, 10:41, Hayes Wang wrote:
This reverts commit 0ee1f4734967af8321ecebaf9c74221ace34f2d5.
This conflicts with commit ffa9fec30ca0 ("r8152: set
RTL8152_UNPLUG only for real disconnection").Could you clarify *why* it conflicts? And how is the problem fixed by 0ee1f473496 avoided now?
quoted hunk ↗ jump to hunk
Signed-off-by: Hayes Wang <redacted> --- drivers/net/usb/r8152.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index eee0f5007ee3..ad3abe26b51b 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c@@ -4021,8 +4021,7 @@ static int rtl8152_close(struct net_device *netdev) #ifdef CONFIG_PM_SLEEP unregister_pm_notifier(&tp->pm_notifier); #endif - 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);
thanks, -- js suse labs