This is a note to let you know that I've just added the patch titled
r8169: call netif_napi_del at errpaths and at driver unload
to the 3.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
r8169-call-netif_napi_del-at-errpaths-and-at-driver-unload.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From [email protected] Sat Oct 6 06:49:17 2012
From: Francois Romieu <[email protected]>
Date: Fri, 5 Oct 2012 23:29:21 +0200
Subject: r8169: call netif_napi_del at errpaths and at driver unload
To: [email protected]
Cc: Hayes Wang <[email protected]>, Jonathan Nieder <[email protected]>
From: Devendra Naga <[email protected]>
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Reviewed-by: Jonathan Nieder <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
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);
Patches currently in stable-queue which might be from [email protected] are
queue-3.0/r8169-fix-config2-msienable-bit-setting.patch
queue-3.0/r8169-remove-erroneous-processing-of-always-set-bit.patch
queue-3.0/r8169-fix-wake-on-lan-setting-for-non-8111e.patch
queue-3.0/r8169-8168c-and-later-require-bit-0x20-to-be-set-in-config2-for-pme-signaling.patch
queue-3.0/r8169-config1-is-read-only-on-8168c-and-later.patch
queue-3.0/r8169-rx-fifo-overflow-fixes.patch
queue-3.0/r8169-jumbo-fixes.patch
queue-3.0/r8169-runtime-resume-before-shutdown.patch
queue-3.0/r8169-increase-the-delay-parameter-of-pm_schedule_suspend.patch
queue-3.0/r8169-don-t-enable-rx-when-shutdown.patch
queue-3.0/r8169-missing-barriers.patch
queue-3.0/r8169-fix-unsigned-int-wraparound-with-tso.patch
queue-3.0/r8169-expand-received-packet-length-indication.patch
queue-3.0/r8169-call-netif_napi_del-at-errpaths-and-at-driver-unload.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
