lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

e100: Fix the TX workqueue race

Browse Source 
Nothing stops the workqueue being left to run in parallel with close or a
few other operations. This causes double unmaps and the like.

See kerneloops.org #1041230 for an example

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alan Cox
2010-04-24 21:09:29 -07:00
committed by David S. Miller
parent 7ce97d4f78
commit 401da6aea3
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/e100.c
View File

@@ -166,6 +166,7 @@
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/rtnetlink.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
@@ -2265,8 +2266,13 @@ static void e100_tx_timeout_task(struct work_struct *work)
DPRINTK(TX_ERR, DEBUG, "scb.status=0x%02X\n", DPRINTK(TX_ERR, DEBUG, "scb.status=0x%02X\n",
ioread8(&nic->csr->scb.status)); ioread8(&nic->csr->scb.status));
e100_down(netdev_priv(netdev));
e100_up(netdev_priv(netdev)); rtnl_lock();
if (netif_running(netdev)) {
e100_down(netdev_priv(netdev));
e100_up(netdev_priv(netdev));
}
rtnl_unlock();
} }
static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode) static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)