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

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

vlan: kill __vlan_hwaccel_rx and vlan_hwaccel_rx 



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

include/linux/if_vlan.h

+0 −22
Original line number Diff line number Diff line
@@ -125,8 +125,6 @@ extern struct net_device *__vlan_find_dev_deep(struct net_device *real_dev, 
extern struct net_device *vlan_dev_real_dev(const struct net_device *dev);

extern u16 vlan_dev_vlan_id(const struct net_device *dev);



extern int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,

			     u16 vlan_tci, int polling);

extern bool vlan_do_receive(struct sk_buff **skb);

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

extern gro_result_t
@@ -155,13 +153,6 @@ static inline u16 vlan_dev_vlan_id(const struct net_device *dev) 
	return 0;

}



static inline int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,

				    u16 vlan_tci, int polling)

{

	BUG();

	return NET_XMIT_SUCCESS;

}



static inline bool vlan_do_receive(struct sk_buff **skb)

{

	if ((*skb)->vlan_tci & VLAN_VID_MASK)
@@ -189,19 +180,6 @@ vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp, 
}

#endif



/**

 * vlan_hwaccel_rx - netif_rx wrapper for VLAN RX acceleration

 * @skb: buffer

 * @grp: vlan group

 * @vlan_tci: VLAN TCI as received from the card

 */

static inline int vlan_hwaccel_rx(struct sk_buff *skb,

				  struct vlan_group *grp,

				  u16 vlan_tci)

{

	return __vlan_hwaccel_rx(skb, grp, vlan_tci, 0);

}



/**

 * vlan_insert_tag - regular VLAN tag inserting

 * @skb: skbuff to tag

net/8021q/vlan_core.c

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

EXPORT_SYMBOL(vlan_dev_vlan_id);



/* VLAN rx hw acceleration helper.  This acts like netif_{rx,receive_skb}(). */

int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,

		      u16 vlan_tci, int polling)

{

	__vlan_hwaccel_put_tag(skb, vlan_tci);

	return polling ? netif_receive_skb(skb) : netif_rx(skb);

}

EXPORT_SYMBOL(__vlan_hwaccel_rx);



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

			      unsigned int vlan_tci, struct sk_buff *skb)

{