From: Hayes Wang <[email protected]>
Date: Fri, 23 Aug 2019 16:53:02 +0800

> Exchange netif_napi_del() and unregister_netdev() in rtl8152_disconnect()
> to avoid using napi_disable() after netif_napi_del().
> 
> Signed-off-by: Hayes Wang <[email protected]>
> ---
>  drivers/net/usb/r8152.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
> index 690a24d1ef82..29390eda5251 100644
> --- a/drivers/net/usb/r8152.c
> +++ b/drivers/net/usb/r8152.c
> @@ -5364,8 +5364,8 @@ static void rtl8152_disconnect(struct usb_interface 
> *intf)
>       if (tp) {
>               rtl_set_unplug(tp);
>  
> -             netif_napi_del(&tp->napi);
>               unregister_netdev(tp->netdev);
> +             netif_napi_del(&tp->napi);
>               cancel_delayed_work_sync(&tp->hw_phy_work);
>               tp->rtl_ops.unload(tp);
>               free_netdev(tp->netdev);

This is completely redundant because free_netdev() will perform all of
the necessary netif_napi_del() calls.

Reply via email to