Commit:     3e1657c8ef53e1cd541cc1e420f3230dc075949b
Parent:     8aee74c8ee875448cc6d1cf995c9469eb60ae515
Author:     Auke Kok <[EMAIL PROTECTED]>
AuthorDate: Mon May 21 14:51:35 2007 -0700
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Mon May 21 19:41:19 2007 -0400

    e1000: Don't enable polling in open() (was: e1000: assertion hit in 
e1000_clean(), kernel
    Herbert Xu wrote:
    "netif_poll_enable can only be called if you've previously called
    netif_poll_disable.  Otherwise a poll might already be in action
    and you may get a crash like this."
    Removing the call to netif_poll_enable in e1000_open should fix this issue,
    the only other call to netif_poll_enable is in e1000_up() which is only
    reached after a device reset or resume.
    Tested by Doug Chapman <[EMAIL PROTECTED]>
    Signed-off-by: Auke Kok <[EMAIL PROTECTED]>
    Acked-by: Herbert Xu <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
 drivers/net/e1000/e1000_main.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 49be393..cbc7feb 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1431,10 +1431,6 @@ e1000_open(struct net_device *netdev)
        /* From here on the code is the same as e1000_up() */
        clear_bit(__E1000_DOWN, &adapter->flags);
-#ifdef CONFIG_E1000_NAPI
-       netif_poll_enable(netdev);
        /* fire a link status change interrupt to start the watchdog */
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