Commit:     416b5d10afdc797c21c457ade3714e8f2f75edd9
Parent:     25805dcf9d83098cf5492117ad2669cd14cc9b24
Author:     Auke Kok <[EMAIL PROTECTED]>
AuthorDate: Fri Jun 1 10:22:39 2007 -0700
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sun Jun 3 11:44:20 2007 -0400

    e1000: disable polling before registering netdevice
    To assure the symmetry of poll enable/disable in up/down, we should
    initialize the netdevice to be poll_disabled at load time. Doing
    this after register_netdevice leaves us open to another race, so
    lets move all the netif_* calls above register_netdevice so the
    stack starts out how we expect it to be.
    Signed-off-by: Auke Kok <[EMAIL PROTECTED]>
    Cc: Herbert Xu <[EMAIL PROTECTED]>
    Cc: Doug Chapman <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
 drivers/net/e1000/e1000_main.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 9ec35b7..cf8af92 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1142,13 +1142,16 @@ e1000_probe(struct pci_dev *pdev,
-       strcpy(netdev->name, "eth%d");
-       if ((err = register_netdev(netdev)))
-               goto err_register;
        /* tell the stack to leave us alone until e1000_open() is called */
+#ifdef CONFIG_E1000_NAPI
+       netif_poll_disable(netdev);
+       strcpy(netdev->name, "eth%d");
+       if ((err = register_netdev(netdev)))
+               goto err_register;
        DPRINTK(PROBE, INFO, "Intel(R) PRO/1000 Network Connection\n");
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to