]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
bnx2x: Don't set netdev->trans_start
authorVladislav Zolotarov <vladz@broadcom.com>
Tue, 17 Nov 2009 06:16:35 +0000 (06:16 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Nov 2009 13:03:14 +0000 (05:03 -0800)
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>
drivers/net/bnx2x_main.c

index bdecd42d2b29a951b1d8faef1532a98f32aaf8a9..77ba13520d87ae539854da167551892655b3ec3d 100644 (file)
@@ -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);