Commit b85be58e authored by Jakub Sitnicki's avatar Jakub Sitnicki Committed by Martin KaFai Lau
Browse files

vlan: Make vlan_remove_tag return nothing 



All callers ignore the return value.

Prepare to reorder memmove() after skb_pull() which is a common pattern.

Signed-off-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
Link: https://patch.msgid.link/20251105-skb-meta-rx-path-v4-4-5ceb08a9b37b@cloudflare.com
parent f38499ff

include/linux/if_vlan.h

+2 −4
Original line number Diff line number Diff line
@@ -731,10 +731,8 @@ static inline void vlan_set_encap_proto(struct sk_buff *skb, 
 *

 * Expects the skb to contain a VLAN tag in the payload, and to have skb->data

 * pointing at the MAC header.

 *

 * Returns: a new pointer to skb->data, or NULL on failure to pull.

 */

static inline void *vlan_remove_tag(struct sk_buff *skb, u16 *vlan_tci)

static inline void vlan_remove_tag(struct sk_buff *skb, u16 *vlan_tci)

{

	struct vlan_hdr *vhdr = (struct vlan_hdr *)(skb->data + ETH_HLEN);
@@ -742,7 +740,7 @@ static inline void *vlan_remove_tag(struct sk_buff *skb, u16 *vlan_tci) 


	memmove(skb->data + VLAN_HLEN, skb->data, 2 * ETH_ALEN);

	vlan_set_encap_proto(skb, vhdr);

	return __skb_pull(skb, VLAN_HLEN);

	__skb_pull(skb, VLAN_HLEN);

}



/**