diff options
| author |   Vladislav Zolotarov <vladz@broadcom.com> | 2009-11-17 06:16:35 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-11-18 05:03:14 -0800 |
| commit | 9a4e328eb2bfa23b160558cff96e17ffa65ea5cf (patch) | |
| tree | e32614013240eaa43c870f3e2f2f016838180458 | |
| parent | linkwatch: linkwatch_forget_dev() to speedup device dismantle (diff) | |
| download | linux-dev-9a4e328eb2bfa23b160558cff96e17ffa65ea5cf.tar.xz linux-dev-9a4e328eb2bfa23b160558cff96e17ffa65ea5cf.zip | |
bnx2x: Don't set netdev->trans_start
Setting dev->trans_start caused spurious watchdog warnings.
Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/bnx2x_main.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index bdecd42d2b29..77ba13520d87 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c @@ -2557,7 +2557,6 @@ static void bnx2x_e1h_disable(struct bnx2x *bp) int port = BP_PORT(bp); netif_tx_disable(bp->dev); - bp->dev->trans_start = jiffies; /* prevent tx timeout */ REG_WR(bp, NIG_REG_LLH0_FUNC_EN + port*8, 0); @@ -7098,7 +7097,6 @@ static void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw) bnx2x_int_disable_sync(bp, disable_hw); bnx2x_napi_disable(bp); netif_tx_disable(bp->dev); - bp->dev->trans_start = jiffies; /* prevent tx timeout */ } /* @@ -10282,7 +10280,6 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up) num_pkts++; fp_tx->tx_bd_prod += 2; /* start + pbd */ - bp->dev->trans_start = jiffies; udelay(100); |