Re: rmmod e1000 hangs (Was Re: 2.6.22-rc2-mm1)

[Jeff Garzik <jgarzik@pobox.com>]

Kok, Auke wrote:
> Herbert Xu wrote:
>> On Fri, May 25, 2007 at 11:04:04PM +1000, Herbert Xu wrote:
>>> [E1000]: Call netif_poll_enable in e1000_open
>>
>> Here is a better one.
>>
>> [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>
> 
> Ack!
> 
> this also fixes all the issues we had seen ourselves. I took a bit of 
> time to get our labs to test it.
> 
> Who can pick this patch up for us? Jeff ?

Is this for -stable or upstream?  I got confused with all the patches 
flying about.

Send it to me, if it's for upstream.

	Jeff