Commit a4aeb26628b5184386f99cf202ac837b0e56c975
Committed by
David S. Miller
1 parent
892ef5d852
Exists in
master
and in
38 other branches
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>
Showing 2 changed files with 0 additions and 31 deletions Side-by-side Diff
include/linux/if_vlan.h
... | ... | @@ -125,8 +125,6 @@ |
125 | 125 | extern struct net_device *vlan_dev_real_dev(const struct net_device *dev); |
126 | 126 | extern u16 vlan_dev_vlan_id(const struct net_device *dev); |
127 | 127 | |
128 | -extern int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp, | |
129 | - u16 vlan_tci, int polling); | |
130 | 128 | extern bool vlan_do_receive(struct sk_buff **skb); |
131 | 129 | extern struct sk_buff *vlan_untag(struct sk_buff *skb); |
132 | 130 | extern gro_result_t |
... | ... | @@ -155,13 +153,6 @@ |
155 | 153 | return 0; |
156 | 154 | } |
157 | 155 | |
158 | -static inline int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp, | |
159 | - u16 vlan_tci, int polling) | |
160 | -{ | |
161 | - BUG(); | |
162 | - return NET_XMIT_SUCCESS; | |
163 | -} | |
164 | - | |
165 | 156 | static inline bool vlan_do_receive(struct sk_buff **skb) |
166 | 157 | { |
167 | 158 | if ((*skb)->vlan_tci & VLAN_VID_MASK) |
... | ... | @@ -188,19 +179,6 @@ |
188 | 179 | return GRO_DROP; |
189 | 180 | } |
190 | 181 | #endif |
191 | - | |
192 | -/** | |
193 | - * vlan_hwaccel_rx - netif_rx wrapper for VLAN RX acceleration | |
194 | - * @skb: buffer | |
195 | - * @grp: vlan group | |
196 | - * @vlan_tci: VLAN TCI as received from the card | |
197 | - */ | |
198 | -static inline int vlan_hwaccel_rx(struct sk_buff *skb, | |
199 | - struct vlan_group *grp, | |
200 | - u16 vlan_tci) | |
201 | -{ | |
202 | - return __vlan_hwaccel_rx(skb, grp, vlan_tci, 0); | |
203 | -} | |
204 | 182 | |
205 | 183 | /** |
206 | 184 | * vlan_insert_tag - regular VLAN tag inserting |
net/8021q/vlan_core.c
... | ... | @@ -96,15 +96,6 @@ |
96 | 96 | } |
97 | 97 | EXPORT_SYMBOL(vlan_dev_vlan_id); |
98 | 98 | |
99 | -/* VLAN rx hw acceleration helper. This acts like netif_{rx,receive_skb}(). */ | |
100 | -int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp, | |
101 | - u16 vlan_tci, int polling) | |
102 | -{ | |
103 | - __vlan_hwaccel_put_tag(skb, vlan_tci); | |
104 | - return polling ? netif_receive_skb(skb) : netif_rx(skb); | |
105 | -} | |
106 | -EXPORT_SYMBOL(__vlan_hwaccel_rx); | |
107 | - | |
108 | 99 | gro_result_t vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp, |
109 | 100 | unsigned int vlan_tci, struct sk_buff *skb) |
110 | 101 | { |