diff options
| author | David S. Miller | 2010-04-27 21:49:13 +0200 |
|---|---|---|
| committer | David S. Miller | 2010-04-27 21:49:13 +0200 |
| commit | e1703b36c358dde24ececba4fd609ecd91433ba3 (patch) | |
| tree | d59c333d0ad5bf72f165264eba6048c87fdc4e0f /drivers/net/e100.c | |
| parent | net: suppress RCU lockdep false positive in twsk_net() (diff) | |
| parent | cxgb3: Wait longer for control packets on initialization (diff) | |
| download | kernel-qcow2-linux-e1703b36c358dde24ececba4fd609ecd91433ba3.tar.gz kernel-qcow2-linux-e1703b36c358dde24ececba4fd609ecd91433ba3.tar.xz kernel-qcow2-linux-e1703b36c358dde24ececba4fd609ecd91433ba3.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e100.c
drivers/net/e1000e/netdev.c
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 3e8d0005540f..ef97bfcef9dd 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -168,6 +168,7 @@ #include <linux/ethtool.h> #include <linux/string.h> #include <linux/firmware.h> +#include <linux/rtnetlink.h> #include <asm/unaligned.h> @@ -2280,8 +2281,13 @@ static void e100_tx_timeout_task(struct work_struct *work) netif_printk(nic, tx_err, KERN_DEBUG, nic->netdev, "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) |