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)