diff options
| author | Gary Robertson <gary.robertson@linaro.org> | 2014-03-03 06:42:33 +0800 |
|---|---|---|
| committer | Gary Robertson <gary.robertson@linaro.org> | 2014-03-03 06:42:33 +0800 |
| commit | de4c0af15b38d383e79555be2d72e7958f1c0756 (patch) | |
| tree | a2f299215c432fdf00354a1307e22f7b8b8c4e40 /drivers/net/ethernet/via/via-rhine.c | |
| parent | 77fe582038582f6aa29a8e76ed319e05a69286e0 (diff) | |
| parent | 61dde96f97bb5b1ed4c11caf9a857d55ad8f6e17 (diff) | |
Merge tag 'v3.10.32' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-v3.10.32-final
This is the 3.10.32 stable release
Diffstat (limited to 'drivers/net/ethernet/via/via-rhine.c')
| -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 75b82b6e8c54..c879969e82fb 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c @@ -1611,6 +1611,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 */ |