diff options
| author | Richard Weinberger <richard@nod.at> | 2014-01-14 22:46:36 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-15 15:21:08 -0800 |
| commit | a926592f5e4e900f3fa903298c4619a131e60963 (patch) | |
| tree | 597e2b19bc29059c66dad3d6a1f952add9854c9b /drivers/net/ethernet/via | |
| parent | 51bb352f15595f2dee42b599680809de3d08999d (diff) | |
| download | blackbird-obmc-linux-a926592f5e4e900f3fa903298c4619a131e60963.tar.gz blackbird-obmc-linux-a926592f5e4e900f3fa903298c4619a131e60963.zip | |
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: Richard Weinberger <richard@nod.at>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/via')
| -rw-r--r-- | drivers/net/ethernet/via/via-rhine.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index cce6c4bc556a..ef312bc6b865 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c @@ -1618,6 +1618,7 @@ static void rhine_reset_task(struct work_struct *work) goto out_unlock; napi_disable(&rp->napi); + netif_tx_disable(dev); spin_lock_bh(&rp->lock); /* clear all descriptors */ |
