lkml.org 
[lkml]   [2012]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 73/84] r8169: call netif_napi_del at errpaths and at driver unload
    Date
    3.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Devendra Naga <devendra.aaru@gmail.com>

    commit ad1be8d345416a794dea39761a374032aa471a76 upstream.

    When register_netdev fails, the init'ed NAPIs by netif_napi_add must be
    deleted with netif_napi_del, and also when driver unloads, it should
    delete the NAPI before unregistering netdevice using unregister_netdev.

    Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/r8169.c | 3 +++
    1 file changed, 3 insertions(+)

    --- a/drivers/net/r8169.c
    +++ b/drivers/net/r8169.c
    @@ -3706,6 +3706,7 @@ out:
    return rc;

    err_out_msi_4:
    + netif_napi_del(&tp->napi);
    rtl_disable_msi(pdev, tp);
    iounmap(ioaddr);
    err_out_free_res_3:
    @@ -3731,6 +3732,8 @@ static void __devexit rtl8169_remove_one

    cancel_delayed_work_sync(&tp->task);

    + netif_napi_del(&tp->napi);
    +
    unregister_netdev(dev);

    rtl_release_firmware(tp);



    \
     
     \ /
      Last update: 2012-10-11 05:21    [W:6.820 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site