Merge tag 'usb-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux-2.6-microblaze.git] / net / dsa / tag_rtl4_a.c

diff --git a/net/dsa/tag_rtl4_a.c b/net/dsa/tag_rtl4_a.c
index 06e901e..40811ba 100644 (file)
--- a/net/dsa/tag_rtl4_a.c
+++ b/net/dsa/tag_rtl4_a.c
@@ -48,7 +48,7 @@ static struct sk_buff *rtl4a_tag_xmit(struct sk_buff *skb,
        skb_push(skb, RTL4_A_HDR_LEN);
 
        dsa_alloc_etype_header(skb, RTL4_A_HDR_LEN);
-       tag = skb->data + 2 * ETH_ALEN;
+       tag = dsa_etype_header_pos_tx(skb);
 
        /* Set Ethertype */
        p = (__be16 *)tag;
@@ -76,12 +76,7 @@ static struct sk_buff *rtl4a_tag_rcv(struct sk_buff *skb,
        if (unlikely(!pskb_may_pull(skb, RTL4_A_HDR_LEN)))
                return NULL;
 
-       /* The RTL4 header has its own custom Ethertype 0x8899 and that
-        * starts right at the beginning of the packet, after the src
-        * ethernet addr. Apparently skb->data always points 2 bytes in,
-        * behind the Ethertype.
-        */
-       tag = skb->data - 2;
+       tag = dsa_etype_header_pos_rx(skb);
        p = (__be16 *)tag;
        etype = ntohs(*p);
        if (etype != RTL4_A_ETHERTYPE) {