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

Commit ffcf9b76 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

vlan: kill vlan_gro_frags and vlan_gro_receive 



Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7ff0bcf6

include/linux/if_vlan.h

+0 −20
Original line number Diff line number Diff line
@@ -127,12 +127,6 @@ extern u16 vlan_dev_vlan_id(const struct net_device *dev); 


extern bool vlan_do_receive(struct sk_buff **skb);

extern struct sk_buff *vlan_untag(struct sk_buff *skb);

extern gro_result_t

vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,

		 unsigned int vlan_tci, struct sk_buff *skb);

extern gro_result_t

vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,

	       unsigned int vlan_tci);



#else

static inline struct net_device *
@@ -164,20 +158,6 @@ static inline struct sk_buff *vlan_untag(struct sk_buff *skb) 
{

	return skb;

}



static inline gro_result_t

vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,

		 unsigned int vlan_tci, struct sk_buff *skb)

{

	return GRO_DROP;

}



static inline gro_result_t

vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,

	       unsigned int vlan_tci)

{

	return GRO_DROP;

}

#endif



/**

net/8021q/vlan_core.c

+0 −16
Original line number Diff line number Diff line
@@ -96,22 +96,6 @@ u16 vlan_dev_vlan_id(const struct net_device *dev) 
}

EXPORT_SYMBOL(vlan_dev_vlan_id);



gro_result_t vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,

			      unsigned int vlan_tci, struct sk_buff *skb)

{

	__vlan_hwaccel_put_tag(skb, vlan_tci);

	return napi_gro_receive(napi, skb);

}

EXPORT_SYMBOL(vlan_gro_receive);



gro_result_t vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,

			    unsigned int vlan_tci)

{

	__vlan_hwaccel_put_tag(napi->skb, vlan_tci);

	return napi_gro_frags(napi);

}

EXPORT_SYMBOL(vlan_gro_frags);



static struct sk_buff *vlan_reorder_header(struct sk_buff *skb)

{

	if (skb_cow(skb, skb_headroom(skb)) < 0)