diff options
author | Jiri Pirko <jpirko@redhat.com> | 2011-07-20 00:54:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-21 16:47:56 -0400 |
commit | a4aeb26628b5184386f99cf202ac837b0e56c975 (patch) | |
tree | 45c99ff239308f6860ae85c9ad6a88525df3fbdf /include/linux | |
parent | 892ef5d85259e193505d553c10237fd5dc9a3d0d (diff) |
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>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/if_vlan.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 3996713caaec..d81beced0dae 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h | |||
@@ -125,8 +125,6 @@ extern struct net_device *__vlan_find_dev_deep(struct net_device *real_dev, | |||
125 | extern struct net_device *vlan_dev_real_dev(const struct net_device *dev); | 125 | extern struct net_device *vlan_dev_real_dev(const struct net_device *dev); |
126 | extern u16 vlan_dev_vlan_id(const struct net_device *dev); | 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 | extern bool vlan_do_receive(struct sk_buff **skb); | 128 | extern bool vlan_do_receive(struct sk_buff **skb); |
131 | extern struct sk_buff *vlan_untag(struct sk_buff *skb); | 129 | extern struct sk_buff *vlan_untag(struct sk_buff *skb); |
132 | extern gro_result_t | 130 | extern gro_result_t |
@@ -155,13 +153,6 @@ static inline u16 vlan_dev_vlan_id(const struct net_device *dev) | |||
155 | return 0; | 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 | static inline bool vlan_do_receive(struct sk_buff **skb) | 156 | static inline bool vlan_do_receive(struct sk_buff **skb) |
166 | { | 157 | { |
167 | if ((*skb)->vlan_tci & VLAN_VID_MASK) | 158 | if ((*skb)->vlan_tci & VLAN_VID_MASK) |
@@ -190,19 +181,6 @@ vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp, | |||
190 | #endif | 181 | #endif |
191 | 182 | ||
192 | /** | 183 | /** |
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 | |||
205 | /** | ||
206 | * vlan_insert_tag - regular VLAN tag inserting | 184 | * vlan_insert_tag - regular VLAN tag inserting |
207 | * @skb: skbuff to tag | 185 | * @skb: skbuff to tag |
208 | * @vlan_tci: VLAN TCI to insert | 186 | * @vlan_tci: VLAN TCI to insert |