The patch titled
e100: fix napi ifdefs removing needed code
has been removed from the -mm tree. Its filename was
e100-fix-napi-ifdefs-removing-needed-code.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: e100: fix napi ifdefs removing needed code
From: Auke Kok <auke-jan.h.kok@xxxxxxxxx>
The e100 driver is NAPI mode only. We need to netif_poll_disable during
suspend and shutdown. The non-NAPI driver code was removed and is only
avaiable in the out-of-tree e100 kernel driver.
Signed-off-by: Auke Kok <auke-jan.h.kok@xxxxxxxxx>
Cc: John Ronciak <john.ronciak@xxxxxxxxx>
Cc: Jesse Brandeburg <jesse.brandeburg@xxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/e100.c | 7 +------
1 files changed, 1 insertion(+), 6 deletions(-)
diff -puN drivers/net/e100.c~e100-fix-napi-ifdefs-removing-needed-code drivers/net/e100.c
--- a/drivers/net/e100.c~e100-fix-napi-ifdefs-removing-needed-code
+++ a/drivers/net/e100.c
@@ -2664,14 +2664,12 @@ static int e100_suspend(struct pci_dev *
struct net_device *netdev = pci_get_drvdata(pdev);
struct nic *nic = netdev_priv(netdev);
-#ifdef CONFIG_E100_NAPI
if (netif_running(netdev))
netif_poll_disable(nic->netdev);
-#endif
del_timer_sync(&nic->watchdog);
netif_carrier_off(nic->netdev);
-
netif_device_detach(netdev);
+
pci_save_state(pdev);
if ((nic->flags & wol_magic) | e100_asf(nic)) {
@@ -2707,16 +2705,13 @@ static int e100_resume(struct pci_dev *p
}
#endif /* CONFIG_PM */
-
static void e100_shutdown(struct pci_dev *pdev)
{
struct net_device *netdev = pci_get_drvdata(pdev);
struct nic *nic = netdev_priv(netdev);
-#ifdef CONFIG_E100_NAPI
if (netif_running(netdev))
netif_poll_disable(nic->netdev);
-#endif
del_timer_sync(&nic->watchdog);
netif_carrier_off(nic->netdev);
_
Patches currently in -mm which might be from auke-jan.h.kok@xxxxxxxxx are
origin.patch
git-netdev-all.patch
rewrite-unnecessary-duplicated-code-to-use-field_sizeof.patch
e1000-use-flush_keventd_work.patch
e1000_7033_dump_ring.patch
e1000-printk-warning-fixes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
