aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-09-29 01:42:06 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:53:51 -0400
commit0da18e3883d18ac716ad8cc07df9bd30933807ac (patch)
tree436a248c7f1a7cfd02dc83dbdff9ab3b579fa529
parent007755eb86c3953bb8615bd016246fc99056580c (diff)
drivers/net/cxgb3/xgmac.c: remove dead code
This patch removes dead code ("tx_xcnt" can never be != 0 at this place) spotted by the Coverity checker. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/cxgb3/xgmac.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/cxgb3/xgmac.c
index ff9e9dcbd87d..bcb5bc4e649b 100644
--- a/drivers/net/cxgb3/xgmac.c
+++ b/drivers/net/cxgb3/xgmac.c
@@ -522,10 +522,7 @@ int t3b2_mac_watchdog_task(struct cmac *mac)
522 goto rxcheck; 522 goto rxcheck;
523 } 523 }
524 524
525 if (((tx_tcnt != mac->tx_tcnt) && 525 if ((tx_tcnt != mac->tx_tcnt) && (mac->tx_xcnt == 0)) {
526 (tx_xcnt == 0) && (mac->tx_xcnt == 0)) ||
527 ((mac->tx_mcnt == tx_mcnt) &&
528 (tx_xcnt != 0) && (mac->tx_xcnt != 0))) {
529 if (mac->toggle_cnt > 4) { 526 if (mac->toggle_cnt > 4) {
530 status = 2; 527 status = 2;
531 goto out; 528 goto out;