From f3c530d23331b3a46bcd75e45384d3ea278ab619 Mon Sep 17 00:00:00 2001 From: Eilon Greenstein Date: Mon, 2 Mar 2009 07:59:56 +0000 Subject: [PATCH] --- yaml --- r: 135019 b: refs/heads/master c: 762d5f6c95e4c7036aaaf67ec0749ed64ebb71e7 h: refs/heads/master i: 135017: 4550696247c54afba6608a11a8e181f8f52b373d 135015: 7646728bfa9752692579ada0aa4b140b7f51bc78 v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2x_main.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 55210bccf261..c63d696ea0e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 490c3c9bf986545bdd99dcd4b0045c747564be39 +refs/heads/master: 762d5f6c95e4c7036aaaf67ec0749ed64ebb71e7 diff --git a/trunk/drivers/net/bnx2x_main.c b/trunk/drivers/net/bnx2x_main.c index 3ef24b9eab3e..5397de1fc8d2 100644 --- a/trunk/drivers/net/bnx2x_main.c +++ b/trunk/drivers/net/bnx2x_main.c @@ -6573,10 +6573,8 @@ static void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw) { bnx2x_int_disable_sync(bp, disable_hw); bnx2x_napi_disable(bp); - if (netif_running(bp->dev)) { - netif_tx_disable(bp->dev); - bp->dev->trans_start = jiffies; /* prevent tx timeout */ - } + netif_tx_disable(bp->dev); + bp->dev->trans_start = jiffies; /* prevent tx timeout */ } /*