Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfca4c52 authored by Shmulik Ladkani's avatar Shmulik Ladkani Committed by David S. Miller
Browse files

net: skbuff: Export __skb_vlan_pop 



This exports the functionality of extracting the tag from the payload,
without moving next vlan tag into hw accel tag.

Signed-off-by: default avatarShmulik Ladkani <shmulik.ladkani@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 688dc536

include/linux/skbuff.h

+1 −0
Original line number Diff line number Diff line
@@ -3085,6 +3085,7 @@ bool skb_gso_validate_mtu(const struct sk_buff *skb, unsigned int mtu); 
struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features);

struct sk_buff *skb_vlan_untag(struct sk_buff *skb);

int skb_ensure_writable(struct sk_buff *skb, int write_len);

int __skb_vlan_pop(struct sk_buff *skb, u16 *vlan_tci);

int skb_vlan_pop(struct sk_buff *skb);

int skb_vlan_push(struct sk_buff *skb, __be16 vlan_proto, u16 vlan_tci);

struct sk_buff *pskb_extract(struct sk_buff *skb, int off, int to_copy,

net/core/skbuff.c

+5 −2
Original line number Diff line number Diff line
@@ -4522,8 +4522,10 @@ int skb_ensure_writable(struct sk_buff *skb, int write_len) 
}

EXPORT_SYMBOL(skb_ensure_writable);



/* remove VLAN header from packet and update csum accordingly. */

static int __skb_vlan_pop(struct sk_buff *skb, u16 *vlan_tci)

/* remove VLAN header from packet and update csum accordingly.

 * expects a non skb_vlan_tag_present skb with a vlan tag payload

 */

int __skb_vlan_pop(struct sk_buff *skb, u16 *vlan_tci)

{

	struct vlan_hdr *vhdr;

	unsigned int offset = skb->data - skb_mac_header(skb);
@@ -4554,6 +4556,7 @@ static int __skb_vlan_pop(struct sk_buff *skb, u16 *vlan_tci) 


	return err;

}

EXPORT_SYMBOL(__skb_vlan_pop);



int skb_vlan_pop(struct sk_buff *skb)

{