Commit a926592f authored by Richard Weinberger's avatar Richard Weinberger Committed by David S. Miller
Browse files

net,via-rhine: Fix tx_timeout handling



rhine_reset_task() misses to disable the tx scheduler upon reset,
this can lead to a crash if work is still scheduled while we're resetting
the tx queue.

Fixes:
[   93.591707] BUG: unable to handle kernel NULL pointer dereference at 0000004c
[   93.595514] IP: [<c119d10d>] rhine_napipoll+0x491/0x6
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 51bb352f
...@@ -1618,6 +1618,7 @@ static void rhine_reset_task(struct work_struct *work) ...@@ -1618,6 +1618,7 @@ static void rhine_reset_task(struct work_struct *work)
goto out_unlock; goto out_unlock;
napi_disable(&rp->napi); napi_disable(&rp->napi);
netif_tx_disable(dev);
spin_lock_bh(&rp->lock); spin_lock_bh(&rp->lock);
/* clear all descriptors */ /* clear all descriptors */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment