diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-05 11:21:32 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-05 11:21:32 -0500 |
| commit | 7892ea23c98c8dd034d34075943dbba8185adaf7 (patch) | |
| tree | 1a67f57453f2ec3b65c4a5e14e46f72570d42ba6 /net | |
| parent | 33c30a8b68cf837b2be3e885ae0a329b880d7666 (diff) | |
| parent | c979da77b3d73b6f2d57ec8b584f3797c2eff7ab (diff) | |
| download | linux-7892ea23c98c8dd034d34075943dbba8185adaf7.tar.gz linux-7892ea23c98c8dd034d34075943dbba8185adaf7.tar.xz | |
Merge branch 'dsa-Move-padding-into-Broadcom-tagger'
Florian Fainelli says:
====================
net: dsa: Move padding into Broadcom tagger
This patch series moves the padding of short packets to where it belongs
within the DSA Broadcom tagger code, I just found myself doing this for
a third driver, which was a clear indication this was wrong and did not
scale.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/dsa/tag_brcm.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c index e6e0b7b6025c..2b06bb91318b 100644 --- a/net/dsa/tag_brcm.c +++ b/net/dsa/tag_brcm.c @@ -70,6 +70,18 @@ static struct sk_buff *brcm_tag_xmit_ll(struct sk_buff *skb, if (skb_cow_head(skb, BRCM_TAG_LEN) < 0) return NULL; + /* The Ethernet switch we are interfaced with needs packets to be at + * least 64 bytes (including FCS) otherwise they will be discarded when + * they enter the switch port logic. When Broadcom tags are enabled, we + * need to make sure that packets are at least 68 bytes + * (including FCS and tag) because the length verification is done after + * the Broadcom tag is stripped off the ingress packet. + * + * Let dsa_slave_xmit() free the SKB + */ + if (__skb_put_padto(skb, ETH_ZLEN + BRCM_TAG_LEN, false)) + return NULL; + skb_push(skb, BRCM_TAG_LEN); if (offset) |