Subject: [PATCH] tg3: Allow for receive of full-size 8021AD frames

From: Vlad Yasevich <[email-masked]>
Date: Tue, 30 Sep 2014 14:53:08 -0400

When receiving a vlan-tagged frame that still contains
a vlan header, the length of the packet will be greater
then MTU+ETH_HLEN since it will account of the extra
vlan header.  TG3 checks this for the case for 802.1Q,
but not for 802.1ad.  As a result, full sized 802.1ad
frames get dropped by the card.

Add a check for 802.1ad protocol when receiving full
sized frames.

Suggested-by: Prashant Sreedharan <[email-masked]>
CC: Prashant Sreedharan <[email-masked]>
CC: Michael Chan <[email-masked]>
Acked-by: Prashant Sreedharan <[email-masked]>
Signed-off-by: Vladislav Yasevich <[email-masked]>
---
This patch somehow got dropped.  Please apply and queue for stable.

 drivers/net/ethernet/broadcom/tg3.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 0a0938d..4f674f9 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -6918,7 +6918,8 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
 		skb->protocol = eth_type_trans(skb, tp->dev);
  		if (len > (tp->dev->mtu + ETH_HLEN) &&
-		    skb->protocol != htons(ETH_P_8021Q)) {
+		    skb->protocol != htons(ETH_P_8021Q) &&
+		    skb->protocol != htons(ETH_P_8021AD)) {
 			dev_kfree_skb_any(skb);
 			goto drop_it_no_recycle;
 		}
-- 
1.9.3