diff options
| author | Richard Weinberger <richard@nod.at> | 2014-01-14 22:46:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-06 11:05:48 -0800 |
| commit | ee270c98472e0bf2ef7d9c15c81be0b1353bd969 (patch) | |
| tree | e2efb72a4d3a7afdc79df78fbdf1ebf40c7f9e4a | |
| parent | df647935d589103da0b8f8e3d4354646c006e85b (diff) | |
| download | linux-stable-ee270c98472e0bf2ef7d9c15c81be0b1353bd969.tar.gz linux-stable-ee270c98472e0bf2ef7d9c15c81be0b1353bd969.tar.bz2 linux-stable-ee270c98472e0bf2ef7d9c15c81be0b1353bd969.zip | |
net,via-rhine: Fix tx_timeout handling
[ Upstream commit a926592f5e4e900f3fa903298c4619a131e60963 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 5fa0880e342e..60f4a51153af 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c @@ -1601,6 +1601,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 */ |