diff options
| author |   Alan Cox <alan@linux.intel.com> | 2010-04-24 21:09:29 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-04-24 21:09:29 -0700 |
| commit | 401da6aea31ef69c2fcd260382adabdcf7ce820a (patch) | |
| tree | 35fe179c0e9714de1d7e7bfd8e2907b54182e918 /drivers/net/e100.c | |
| parent | gianfar: Fix potential oops during OF address translation (diff) | |
| download | linux-dev-401da6aea31ef69c2fcd260382adabdcf7ce820a.tar.xz linux-dev-401da6aea31ef69c2fcd260382adabdcf7ce820a.zip | |
e100: Fix the TX workqueue race
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>
Diffstat (limited to 'drivers/net/e100.c')
| -rw-r--r-- | drivers/net/e100.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index b997e578e58f..791080303db1 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -166,6 +166,7 @@ #include <linux/ethtool.h> #include <linux/string.h> #include <linux/firmware.h> +#include <linux/rtnetlink.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", 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) |