lkml.org 
[lkml]   [2019]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net v3 1/2] Revert "r8152: napi hangup fix after disconnect"
    Date
    This reverts commit 0ee1f4734967af8321ecebaf9c74221ace34f2d5.

    The commit 0ee1f4734967 ("r8152: napi hangup fix after
    disconnect") adds a check about RTL8152_UNPLUG to determine
    if calling napi_disable() is invalid in rtl8152_close(),
    when rtl8152_disconnect() is called. This avoids to use
    napi_disable() after calling netif_napi_del().

    Howver, commit ffa9fec30ca0 ("r8152: set RTL8152_UNPLUG
    only for real disconnection") causes that RTL8152_UNPLUG
    is not always set when calling rtl8152_disconnect().
    Therefore, I have to revert commit 0ee1f4734967 ("r8152:
    napi hangup fix after disconnect"), first. And submit
    another patch to fix it.

    Signed-off-by: Hayes Wang <hayeswang@realtek.com>
    ---
    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);
    --
    2.21.0
    \
     
     \ /
      Last update: 2019-08-28 03:52    [W:2.211 / U:0.324 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site