diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2011-06-13 13:38:56 +0000 |
|---|---|---|
| committer | David S. Miller <davem@conan.davemloft.net> | 2011-06-15 11:11:56 -0400 |
| commit | daf9a55387df8f429d1219bbdabba1ab33d2a479 (patch) | |
| tree | 41c26559748f6d29f5230b8e686abb9967c79a96 /drivers | |
| parent | 0e6cf6a9e3cf911577b1dde0dc724f634e4ca119 (diff) | |
| download | linux-daf9a55387df8f429d1219bbdabba1ab33d2a479.tar.gz linux-daf9a55387df8f429d1219bbdabba1ab33d2a479.tar.bz2 linux-daf9a55387df8f429d1219bbdabba1ab33d2a479.zip | |
tg3: Remove 40BIT_DMA_LIMIT_BUG
This patch removes the 40BIT_DMA_LIMIT_BUG flag. There already exists a
flag for this purpose (TG3_FLAG_40BIT_DMA_BUG) and was already being
used in the correct spot.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Reviewed-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: David S. Miller <davem@conan.davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/tg3.c | 8 | ||||
| -rw-r--r-- | drivers/net/tg3.h | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 46352da36a81..c4f193eba82d 100644 --- a/drivers/net/tg3.c +++ b/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/drivers/net/tg3.h b/drivers/net/tg3.h index 3c113c1e9d35..4f5dbf6adfe2 100644 --- a/drivers/net/tg3.h +++ b/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, |