diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2011-06-13 09:38:56 -0400 |
---|---|---|
committer | David S. Miller <davem@conan.davemloft.net> | 2011-06-15 11:11:56 -0400 |
commit | daf9a55387df8f429d1219bbdabba1ab33d2a479 (patch) | |
tree | 41c26559748f6d29f5230b8e686abb9967c79a96 /drivers/net/tg3.c | |
parent | 0e6cf6a9e3cf911577b1dde0dc724f634e4ca119 (diff) |
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/net/tg3.c')
-rw-r--r-- | drivers/net/tg3.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 46352da36a8..c4f193eba82 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) | |||
6022 | tg3_4g_overflow_test(mapping, len)) | 6022 | tg3_4g_overflow_test(mapping, len)) |
6023 | would_hit_hwbug = 1; | 6023 | would_hit_hwbug = 1; |
6024 | 6024 | ||
6025 | if (tg3_flag(tp, 40BIT_DMA_LIMIT_BUG) && | 6025 | if (tg3_40bit_overflow_test(tp, mapping, len)) |
6026 | tg3_40bit_overflow_test(tp, mapping, len)) | ||
6027 | would_hit_hwbug = 1; | 6026 | would_hit_hwbug = 1; |
6028 | 6027 | ||
6029 | if (tg3_flag(tp, 5701_DMA_BUG)) | 6028 | 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) | |||
6060 | tg3_4g_overflow_test(mapping, len)) | 6059 | tg3_4g_overflow_test(mapping, len)) |
6061 | would_hit_hwbug = 1; | 6060 | would_hit_hwbug = 1; |
6062 | 6061 | ||
6063 | if (tg3_flag(tp, 40BIT_DMA_LIMIT_BUG) && | 6062 | if (tg3_40bit_overflow_test(tp, mapping, len)) |
6064 | tg3_40bit_overflow_test(tp, mapping, len)) | ||
6065 | would_hit_hwbug = 1; | 6063 | would_hit_hwbug = 1; |
6066 | 6064 | ||
6067 | if (tg3_flag(tp, HW_TSO_1) || | 6065 | if (tg3_flag(tp, HW_TSO_1) || |
@@ -13712,8 +13710,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) | |||
13712 | 13710 | ||
13713 | if (tg3_flag(tp, 5755_PLUS)) | 13711 | if (tg3_flag(tp, 5755_PLUS)) |
13714 | tg3_flag_set(tp, SHORT_DMA_BUG); | 13712 | tg3_flag_set(tp, SHORT_DMA_BUG); |
13715 | else | ||
13716 | tg3_flag_set(tp, 40BIT_DMA_LIMIT_BUG); | ||
13717 | 13713 | ||
13718 | if (tg3_flag(tp, 5717_PLUS)) | 13714 | if (tg3_flag(tp, 5717_PLUS)) |
13719 | tg3_flag_set(tp, LRG_PROD_RING_CAP); | 13715 | tg3_flag_set(tp, LRG_PROD_RING_CAP); |