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>
(cherry picked from commit daf9a55387df8f429d1219bbdabba1ab33d2a479)

Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 27722fd6d4e9781e7558329139e35e66ca935592..58a98a9b851d6b75cda8f6480dc92738a2b40773 100644 (file)
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -6028,8 +6028,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))
@@ -6066,8 +6065,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) ||
@@ -13680,8 +13678,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 5b3d2f34da7ae217bb6f3e33dd458774405d42f3..34072a3f471f8e8f23690e7b85ba43ec2056add4 100644 (file)
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2894,7 +2894,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,