netdev
[Top] [All Lists]

[PATCH 2.4] e1000: fix napi crash on ifdown during traffic

To: jgarzik@xxxxxxxxx
Subject: [PATCH 2.4] e1000: fix napi crash on ifdown during traffic
From: Scott Feldman <scott.feldman@xxxxxxxxx>
Date: Thu, 3 Jun 2004 18:18:35 -0700 (PDT)
Cc: netdev@xxxxxxxxxxx, <jesse.brandeburg@xxxxxxxxx>
Replyto: "Scott Feldman" <scott.feldman@xxxxxxxxx>
Sender: netdev-bounce@xxxxxxxxxxx
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);



<Prev in Thread] Current Thread [Next in Thread>