From c64c67e984644e705814478017996034d9cc9309 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 6 Jun 2007 14:25:36 -0700 Subject: [PATCH] remove patch that was already in the queue --- ...able-polling-in-open-kernel-2.6.21.1.patch | 43 ------------------- queue-2.6.21/series | 1 - 2 files changed, 44 deletions(-) delete mode 100644 queue-2.6.21/e1000-don-t-enable-polling-in-open-kernel-2.6.21.1.patch diff --git a/queue-2.6.21/e1000-don-t-enable-polling-in-open-kernel-2.6.21.1.patch b/queue-2.6.21/e1000-don-t-enable-polling-in-open-kernel-2.6.21.1.patch deleted file mode 100644 index 8d8c61eec8e..00000000000 --- a/queue-2.6.21/e1000-don-t-enable-polling-in-open-kernel-2.6.21.1.patch +++ /dev/null @@ -1,43 +0,0 @@ -From stable-bounces@linux.kernel.org Mon May 21 14:57:32 2007 -From: Auke Kok -Date: Mon, 21 May 2007 14:55:36 -0700 -Subject: e1000: Don't enable polling in open() (was: e1000: assertion hit in e1000_clean(), kernel 2.6.21.1)] -To: stable@kernel.org, Greg KH -Message-ID: <46521558.2010309@intel.com> - -From: Auke Kok - -Herbert Xu wrote: -"netif_poll_enable can only be called if you've previously called -netif_poll_disable. Otherwise a poll might already be in action -and you may get a crash like this." - -Removing the call to netif_poll_enable in e1000_open should fix this issue, -the only other call to netif_poll_enable is in e1000_up() which is only -reached after a device reset or resume. - -Bugzilla: http://bugzilla.kernel.org/show_bug.cgi?id=8455 -https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=240339 - -Tested by Doug Chapman - -Signed-off-by: Auke Kok -Acked-by: Herbert Xu -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/e1000/e1000_main.c | 3 --- - 1 file changed, 3 deletions(-) - ---- a/drivers/net/e1000/e1000_main.c -+++ b/drivers/net/e1000/e1000_main.c -@@ -549,9 +549,6 @@ e1000_up(struct e1000_adapter *adapter) - - adapter->tx_queue_len = netdev->tx_queue_len; - --#ifdef CONFIG_E1000_NAPI -- netif_poll_enable(netdev); --#endif - e1000_irq_enable(adapter); - - clear_bit(__E1000_DOWN, &adapter->flags); diff --git a/queue-2.6.21/series b/queue-2.6.21/series index 071afb6c2e4..1c68e2ac3fb 100644 --- a/queue-2.6.21/series +++ b/queue-2.6.21/series @@ -37,4 +37,3 @@ acpi-fix-potential-call-to-a-freed-memory-section.patch aacraid-correct-sa-platform-support.patch cciss-fix-pci_driver.shutdown-while-device-is-still-active.patch sysfs-store-sysfs-inode-nrs-in-s_ino-to-avoid-readdir-oopses.patch -e1000-don-t-enable-polling-in-open-kernel-2.6.21.1.patch -- 2.47.3