Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit daf9a553 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

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: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Reviewed-by: default avatarBenjamin Li <benli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@conan.davemloft.net>
parent 0e6cf6a9

drivers/net/tg3.c

+2 −6
Original line number Diff line number Diff line
@@ -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);

drivers/net/tg3.h

+0 −1
Original line number Diff line number Diff line
@@ -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,