diff options
| author |   Vlad Yasevich <vyasevich@gmail.com> | 2014-09-30 19:39:36 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-10-01 16:43:45 -0400 |
| commit | 7d3083ee36b51e425b6abd76778a2046906b0fd3 (patch) | |
| tree | f518f81fe67e5210f72ec6e7705a5fd288be614f /drivers/net/ethernet/broadcom/tg3.c | |
| parent | r8152: fix setting RTL8152_UNPLUG (diff) | |
| download | linux-dev-7d3083ee36b51e425b6abd76778a2046906b0fd3.tar.xz linux-dev-7d3083ee36b51e425b6abd76778a2046906b0fd3.zip | |
tg3: Allow for recieve of full-size 8021AD frames
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 receving full
sized frames.
Suggested-by: Prashant Sreedharan <prashant@broadcom.com>
CC: Prashant Sreedharan <prashant@broadcom.com>
CC: Michael Chan <mchan@broadcom.com>
Signed-off-by: Vladislav Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index e7d3a620d96a..ba499489969a 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; } |