Message ID | 542AFC14.6030304@redhat.com |
---|---|
State | Deferred, archived |
Delegated to: | David Miller |
Headers | show |
From: Vlad Yasevich <vyasevic@redhat.com> Date: Tue, 30 Sep 2014 14:53:08 -0400 > This patch somehow got dropped. Please apply and queue for stable. Because I applied your original patch: http://patchwork.ozlabs.org/patch/390834/ This patch here doesn't even apply to the 'net' tree because of that. Please sort that out. I'm marking this patch and the similar bnx2 one 'deferred'. Please resubmit everything once you've sorted things out. Thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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