* [PATCH 2.4] e1000: fix napi crash on ifdown during traffic
@ 2004-06-04 1:18 Scott Feldman
2004-06-04 1:29 ` [PATCH 2.5] " Jesse Brandeburg
2004-06-08 18:36 ` [PATCH 2.4] " Jeff Garzik
0 siblings, 2 replies; 4+ messages in thread
From: Scott Feldman @ 2004-06-04 1:18 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, jesse.brandeburg
Signed off by: Jesse Brandeburg
diff -Naurp linux-2.4/drivers/net/e1000/e1000_main.c linux-2.4/drivers/net/e1000.mod/e1000_main.c
--- linux-2.4/drivers/net/e1000/e1000_main.c 2004-06-03 18:00:32.000000000 -0700
+++ linux-2.4/drivers/net/e1000.mod/e1000_main.c 2004-06-03 18:01:11.000000000 -0700
@@ -52,7 +52,7 @@
char e1000_driver_name[] = "e1000";
char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
-char e1000_driver_version[] = "5.2.52-k1";
+char e1000_driver_version[] = "5.2.52-k3";
char e1000_copyright[] = "Copyright (c) 1999-2004 Intel Corporation.";
/* e1000_pci_tbl - PCI Device ID Table
@@ -2143,6 +2143,7 @@ e1000_clean(struct net_device *netdev, i
if(work_done < work_to_do || !netif_running(netdev)) {
netif_rx_complete(netdev);
e1000_irq_enable(adapter);
+ return 0;
}
return (work_done >= work_to_do);
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2.5] e1000: fix napi crash on ifdown during traffic
2004-06-04 1:18 [PATCH 2.4] e1000: fix napi crash on ifdown during traffic Scott Feldman
@ 2004-06-04 1:29 ` Jesse Brandeburg
2004-06-08 18:37 ` Jeff Garzik
2004-06-08 18:36 ` [PATCH 2.4] " Jeff Garzik
1 sibling, 1 reply; 4+ messages in thread
From: Jesse Brandeburg @ 2004-06-04 1:29 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, jesse.brandeburg
Signed off by: Jesse Brandeburg
diff -Naurp linux-2.5/drivers/net/e1000/e1000_main.c linux-2.5/drivers/net/e1000.mod/e1000_main.c
--- linux-2.5/drivers/net/e1000/e1000_main.c 2004-06-03 17:57:55.000000000 -0700
+++ linux-2.5/drivers/net/e1000.mod/e1000_main.c 2004-06-03 17:59:04.000000000 -0700
@@ -52,7 +52,7 @@
char e1000_driver_name[] = "e1000";
char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
-char e1000_driver_version[] = "5.2.52-k2";
+char e1000_driver_version[] = "5.2.52-k4";
char e1000_copyright[] = "Copyright (c) 1999-2004 Intel Corporation.";
/* e1000_pci_tbl - PCI Device ID Table
@@ -2143,6 +2143,7 @@ e1000_clean(struct net_device *netdev, i
if(work_done < work_to_do || !netif_running(netdev)) {
netif_rx_complete(netdev);
e1000_irq_enable(adapter);
+ return 0;
}
return (work_done >= work_to_do);
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2.4] e1000: fix napi crash on ifdown during traffic
2004-06-04 1:18 [PATCH 2.4] e1000: fix napi crash on ifdown during traffic Scott Feldman
2004-06-04 1:29 ` [PATCH 2.5] " Jesse Brandeburg
@ 2004-06-08 18:36 ` Jeff Garzik
1 sibling, 0 replies; 4+ messages in thread
From: Jeff Garzik @ 2004-06-08 18:36 UTC (permalink / raw)
To: Scott Feldman; +Cc: netdev, jesse.brandeburg
applied
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2.5] e1000: fix napi crash on ifdown during traffic
2004-06-04 1:29 ` [PATCH 2.5] " Jesse Brandeburg
@ 2004-06-08 18:37 ` Jeff Garzik
0 siblings, 0 replies; 4+ messages in thread
From: Jeff Garzik @ 2004-06-08 18:37 UTC (permalink / raw)
To: Jesse Brandeburg; +Cc: netdev
applied
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2004-06-08 18:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-06-04 1:18 [PATCH 2.4] e1000: fix napi crash on ifdown during traffic Scott Feldman
2004-06-04 1:29 ` [PATCH 2.5] " Jesse Brandeburg
2004-06-08 18:37 ` Jeff Garzik
2004-06-08 18:36 ` [PATCH 2.4] " Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).