From 1c68829f48baa9b96bca28688b176899fc3e702c Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Fri, 1 Jun 2007 10:22:39 -0700 Subject: [PATCH] --- yaml --- r: 57309 b: refs/heads/master c: 416b5d10afdc797c21c457ade3714e8f2f75edd9 h: refs/heads/master i: 57307: ee981c5e1b6b5ddcbce476de610e3928f045fb64 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dc31d26149a9..4c4d8eb90027 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25805dcf9d83098cf5492117ad2669cd14cc9b24 +refs/heads/master: 416b5d10afdc797c21c457ade3714e8f2f75edd9 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 9ec35b7a8207..cf8af928a69c 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -1142,13 +1142,16 @@ e1000_probe(struct pci_dev *pdev, !e1000_check_mng_mode(&adapter->hw)) e1000_get_hw_control(adapter); - 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 */ netif_carrier_off(netdev); netif_stop_queue(netdev); +#ifdef CONFIG_E1000_NAPI + netif_poll_disable(netdev); +#endif + + strcpy(netdev->name, "eth%d"); + if ((err = register_netdev(netdev))) + goto err_register; DPRINTK(PROBE, INFO, "Intel(R) PRO/1000 Network Connection\n");