rtl83xx: update the tree to biot's dsa cleanup

[openwrt/staging/blogic.git] / target / linux / rtl838x / patches-5.4 / 701-net-dsa-add-rtl838x-support-for-tag-trailer.patch

diff --git a/target/linux/rtl838x/patches-5.4/701-net-dsa-add-rtl838x-support-for-tag-trailer.patch b/target/linux/rtl838x/patches-5.4/701-net-dsa-add-rtl838x-support-for-tag-trailer.patch
index d45c54780378cc3b8adf537184a1bee5f9bffb13..9d4140c8e11cfad3abb84fc62593ff31bc7beac9 100644 (file)
--- a/target/linux/rtl838x/patches-5.4/701-net-dsa-add-rtl838x-support-for-tag-trailer.patch
+++ b/target/linux/rtl838x/patches-5.4/701-net-dsa-add-rtl838x-support-for-tag-trailer.patch
@@ -1,15 +1,17 @@
---- a/net/dsa/tag_trailer.c
-+++ b/net/dsa/tag_trailer.c
+Index: linux-5.4.77/net/dsa/tag_trailer.c
+===================================================================
+--- linux-5.4.77.orig/net/dsa/tag_trailer.c
++++ linux-5.4.77/net/dsa/tag_trailer.c
 @@ -44,7 +44,12 @@ static struct sk_buff *trailer_xmit(stru
  
        trailer = skb_put(nskb, 4);
        trailer[0] = 0x80;
 +
-+#ifdef CONFIG_NET_DSA_RTL838X
++#ifdef CONFIG_NET_DSA_RTL83XX
 +      trailer[1] = dp->index;
 +#else
        trailer[1] = 1 << dp->index;
-+#endif /* CONFIG_NET_DSA_RTL838X */
++#endif /* CONFIG_NET_DSA_RTL83XX */
        trailer[2] = 0x10;
        trailer[3] = 0x00;
  
@@ -18,7 +20,7 @@
  
        trailer = skb_tail_pointer(skb) - 4;
 +
-+#ifdef CONFIG_NET_DSA_RTL838X
++#ifdef CONFIG_NET_DSA_RTL83XX
 +      if (trailer[0] != 0x80 || (trailer[1] & 0xe0) != 0x00 ||
 +          (trailer[2] & 0xef) != 0x00 || trailer[3] != 0x00)
 +              return NULL;