vlan: kill __vlan_hwaccel_rx and vlan_hwaccel_rx
Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
892ef5d852
commit
a4aeb26628
|
@ -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 struct net_device *vlan_dev_real_dev(const struct net_device *dev);
|
||||||
extern u16 vlan_dev_vlan_id(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 bool vlan_do_receive(struct sk_buff **skb);
|
||||||
extern struct sk_buff *vlan_untag(struct sk_buff *skb);
|
extern struct sk_buff *vlan_untag(struct sk_buff *skb);
|
||||||
extern gro_result_t
|
extern gro_result_t
|
||||||
|
@ -155,13 +153,6 @@ static inline u16 vlan_dev_vlan_id(const struct net_device *dev)
|
||||||
return 0;
|
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)
|
static inline bool vlan_do_receive(struct sk_buff **skb)
|
||||||
{
|
{
|
||||||
if ((*skb)->vlan_tci & VLAN_VID_MASK)
|
if ((*skb)->vlan_tci & VLAN_VID_MASK)
|
||||||
|
@ -189,19 +180,6 @@ vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,
|
||||||
}
|
}
|
||||||
#endif
|
#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
|
* vlan_insert_tag - regular VLAN tag inserting
|
||||||
* @skb: skbuff to tag
|
* @skb: skbuff to tag
|
||||||
|
|
|
@ -96,15 +96,6 @@ u16 vlan_dev_vlan_id(const struct net_device *dev)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(vlan_dev_vlan_id);
|
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,
|
gro_result_t vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
|
||||||
unsigned int vlan_tci, struct sk_buff *skb)
|
unsigned int vlan_tci, struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue