--- a/net/dsa/tag_mtk.c
+++ b/net/dsa/tag_mtk.c
-@@ -25,6 +25,14 @@ static struct sk_buff *mtk_tag_xmit(stru
+@@ -25,6 +25,13 @@ static struct sk_buff *mtk_tag_xmit(stru
u8 xmit_tpid;
u8 *mtk_tag;
+ * corrupted. With tags enabled, we need to make sure that packets are
+ * at least 68 bytes (including FCS and tag).
+ */
-+ if (__skb_put_padto(skb, ETH_ZLEN + MTK_HDR_LEN, false))
-+ return NULL;
++ eth_skb_pad(skb);
+
/* Build the special tag after the MAC Source Address. If VLAN header
* is present, it's required that VLAN header and special tag is
--- a/net/dsa/tag_mtk.c
+++ b/net/dsa/tag_mtk.c
-@@ -25,6 +25,14 @@ static struct sk_buff *mtk_tag_xmit(stru
+@@ -25,6 +25,13 @@ static struct sk_buff *mtk_tag_xmit(stru
u8 xmit_tpid;
u8 *mtk_tag;
+ * corrupted. With tags enabled, we need to make sure that packets are
+ * at least 68 bytes (including FCS and tag).
+ */
-+ if (__skb_put_padto(skb, ETH_ZLEN + MTK_HDR_LEN, false))
-+ return NULL;
++ eth_skb_pad(skb);
+
/* Build the special tag after the MAC Source Address. If VLAN header
* is present, it's required that VLAN header and special tag is
--- a/net/dsa/tag_mtk.c
+++ b/net/dsa/tag_mtk.c
-@@ -33,6 +33,8 @@ static struct sk_buff *mtk_tag_xmit(stru
- if (__skb_put_padto(skb, ETH_ZLEN + MTK_HDR_LEN, false))
- return NULL;
+@@ -32,6 +32,8 @@ static struct sk_buff *mtk_tag_xmit(stru
+ */
+ eth_skb_pad(skb);
+ skb_set_queue_mapping(skb, dp->index);
+