From 67fd06c6c811c8c20d8be5cbcadf1a5120faa315 Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Mon, 13 Jun 2011 13:38:56 +0000 Subject: [PATCH] --- yaml --- r: 255552 b: refs/heads/master c: daf9a55387df8f429d1219bbdabba1ab33d2a479 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 8 ++------ trunk/drivers/net/tg3.h | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index fd8bb8bc3ed4..71878f7263df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e6cf6a9e3cf911577b1dde0dc724f634e4ca119 +refs/heads/master: daf9a55387df8f429d1219bbdabba1ab33d2a479 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 46352da36a81..c4f193eba82d 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -6022,8 +6022,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) tg3_4g_overflow_test(mapping, len)) would_hit_hwbug = 1; - if (tg3_flag(tp, 40BIT_DMA_LIMIT_BUG) && - tg3_40bit_overflow_test(tp, mapping, len)) + if (tg3_40bit_overflow_test(tp, mapping, len)) would_hit_hwbug = 1; if (tg3_flag(tp, 5701_DMA_BUG)) @@ -6060,8 +6059,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) tg3_4g_overflow_test(mapping, len)) would_hit_hwbug = 1; - if (tg3_flag(tp, 40BIT_DMA_LIMIT_BUG) && - tg3_40bit_overflow_test(tp, mapping, len)) + if (tg3_40bit_overflow_test(tp, mapping, len)) would_hit_hwbug = 1; if (tg3_flag(tp, HW_TSO_1) || @@ -13712,8 +13710,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) if (tg3_flag(tp, 5755_PLUS)) tg3_flag_set(tp, SHORT_DMA_BUG); - else - tg3_flag_set(tp, 40BIT_DMA_LIMIT_BUG); if (tg3_flag(tp, 5717_PLUS)) tg3_flag_set(tp, LRG_PROD_RING_CAP); diff --git a/trunk/drivers/net/tg3.h b/trunk/drivers/net/tg3.h index 3c113c1e9d35..4f5dbf6adfe2 100644 --- a/trunk/drivers/net/tg3.h +++ b/trunk/drivers/net/tg3.h @@ -2897,7 +2897,6 @@ enum TG3_FLAGS { TG3_FLAG_ENABLE_RSS, TG3_FLAG_ENABLE_TSS, TG3_FLAG_4G_DMA_BNDRY_BUG, - TG3_FLAG_40BIT_DMA_LIMIT_BUG, TG3_FLAG_SHORT_DMA_BUG, TG3_FLAG_USE_JUMBO_BDFLAG, TG3_FLAG_L1PLLPD_EN,