diff options
| author | Breno Leitao <leitao@linux.vnet.ibm.com> | 2009-12-18 20:35:34 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-18 20:35:34 -0800 |
| commit | e6bf95ffa8d6f8f4b7ee33ea01490d95b0bbeb6e (patch) | |
| tree | 6a361fa1fde7ac2ce613d5ad88ff9b688c02f5ad /drivers/net | |
| parent | 4773a47d8a564633cd80b94df397e91e946893e2 (diff) | |
| download | kernel-crypto-e6bf95ffa8d6f8f4b7ee33ea01490d95b0bbeb6e.tar.gz kernel-crypto-e6bf95ffa8d6f8f4b7ee33ea01490d95b0bbeb6e.tar.xz kernel-crypto-e6bf95ffa8d6f8f4b7ee33ea01490d95b0bbeb6e.zip | |
bnx2: fixing a timout error due not refreshing TX timers correctly
When running the following script on an active bnx2 interface:
while(true); do ifconfig ethX mtu 9000; ifconfig ethX mtu 1500; done
A timeout error appears and dumps the following stack:
NETDEV WATCHDOG: eth4 (bnx2): transmit queue 0 timed out
------------[ cut here ]------------
Badness at net/sched/sch_generic.c:261
<snip>
This patch just fixes the way that ->trans_start is refreshed.
Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
Acked-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/bnx2.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index c3e2b279fca..f38764ec02c 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -654,9 +654,17 @@ bnx2_netif_stop(struct bnx2 *bp) { bnx2_cnic_stop(bp); if (netif_running(bp->dev)) { + int i; + bnx2_napi_disable(bp); netif_tx_disable(bp->dev); - bp->dev->trans_start = jiffies; /* prevent tx timeout */ + /* prevent tx timeout */ + for (i = 0; i < bp->dev->num_tx_queues; i++) { + struct netdev_queue *txq; + + txq = netdev_get_tx_queue(bp->dev, i); + txq->trans_start = jiffies; + } } } |