]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
e1000: restore netif_poll_enable call but make sure IRQs are off
authorHerbert Xu <herbert@gondor.apana.org.au>
Tue, 29 May 2007 22:07:31 +0000 (15:07 -0700)
committerJeff Garzik <jeff@garzik.org>
Wed, 30 May 2007 13:52:48 +0000 (09:52 -0400)
commit47313054352b879a2bc65379d55b05f48a0af7ec
treef9876f1cd9891232ac4814b6c08145d1f3050178
parent8a32352661cc8e942897d205ba18f871ef7be597
e1000: restore netif_poll_enable call but make sure IRQs are off

This restores the previously removed netif_poll_enable call in e1000_open.
It's needed on all but the first call to e1000_open for a NIC as
e1000_close always calls netif_poll_disable.

netif_poll_enable can only be called safely if no polls have been
scheduled.  This should be the case as long as we don't enter our IRQ
handler.

In order to guarantee this we explicitly disable IRQs as early as possible
when we're probing the NIC.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "Kok, Auke" <auke-jan.h.kok@intel.com>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/e1000/e1000_main.c