aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x_main.c
diff options
context:
space:
mode:
authorVladislav Zolotarov <vladz@broadcom.com>2009-11-17 01:16:35 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-18 08:03:14 -0500
commit9a4e328eb2bfa23b160558cff96e17ffa65ea5cf (patch)
treee32614013240eaa43c870f3e2f2f016838180458 /drivers/net/bnx2x_main.c
parente014debecd3ee3832e6476b3a9c948edfcfd1250 (diff)
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>
Diffstat (limited to 'drivers/net/bnx2x_main.c')
-rw-r--r--drivers/net/bnx2x_main.c3
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)
2557 int port = BP_PORT(bp); 2557 int port = BP_PORT(bp);
2558 2558
2559 netif_tx_disable(bp->dev); 2559 netif_tx_disable(bp->dev);
2560 bp->dev->trans_start = jiffies; /* prevent tx timeout */
2561 2560
2562 REG_WR(bp, NIG_REG_LLH0_FUNC_EN + port*8, 0); 2561 REG_WR(bp, NIG_REG_LLH0_FUNC_EN + port*8, 0);
2563 2562
@@ -7098,7 +7097,6 @@ static void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw)
7098 bnx2x_int_disable_sync(bp, disable_hw); 7097 bnx2x_int_disable_sync(bp, disable_hw);
7099 bnx2x_napi_disable(bp); 7098 bnx2x_napi_disable(bp);
7100 netif_tx_disable(bp->dev); 7099 netif_tx_disable(bp->dev);
7101 bp->dev->trans_start = jiffies; /* prevent tx timeout */
7102} 7100}
7103 7101
7104/* 7102/*
@@ -10282,7 +10280,6 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up)
10282 10280
10283 num_pkts++; 10281 num_pkts++;
10284 fp_tx->tx_bd_prod += 2; /* start + pbd */ 10282 fp_tx->tx_bd_prod += 2; /* start + pbd */
10285 bp->dev->trans_start = jiffies;
10286 10283
10287 udelay(100); 10284 udelay(100);
10288 10285