Commit 416b5d10 authored Jun 01, 2007 by Auke Kok Committed by Jeff Garzik Jun 03, 2007

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 <auke-jan.h.kok@intel.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Doug Chapman <doug.chapman@hp.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

parent 25805dcf

drivers/net/e1000/e1000_main.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -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");