Auke Kok wrote:
Jeff Garzik wrote:
Kok, Auke wrote:
Hi,
The following fixes targeted to netdev-2.6#upstream-fixes are available
through git:
git pull git://lost.foo-projects.org/~ahkok/git/netdev-2.6
upstream-fixes
hrm. since another e100 fixes got applied, can you either (a) update
the above URL for that change, or (b) provide separate e100 and e1000
pull urls?
I dropped the e100 patch from the series, it now contains (at the above
url) only the e1000 changes.
okay, I've rebased the trees on the latest upstream-fixes and master from netdev-2.6,
and on top of that added the latest e100 shutdown patch to it (see below).
Jeff,
Please pull from git://lost.foo-projects.org/~ahkok/git/netdev-2.6
upstream-fixes in to your #upstream-fixes or #upstream-linus branch so that these
fixes get into 2.6.19.
Thanks.
Auke
---
e100: account for closed interface when shutting down
From: Auke Kok <[EMAIL PROTECTED]>
Account for the interface being closed before disabling polling
on a device, to fix shutdown on some systems that explcitly close
the netdevice before calling shutdown.
Signed-off-by: Auke Kok <[EMAIL PROTECTED]>
---
drivers/net/e100.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index a3a08a5..19ab344 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2719,7 +2719,10 @@ static int e100_suspend(struct pci_dev *
struct net_device *netdev = pci_get_drvdata(pdev);
struct nic *nic = netdev_priv(netdev);
- netif_poll_disable(nic->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);
@@ -2763,7 +2766,10 @@ static void e100_shutdown(struct pci_dev
struct net_device *netdev = pci_get_drvdata(pdev);
struct nic *nic = netdev_priv(netdev);
- netif_poll_disable(nic->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);
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
