diff options
author | Jiri Pirko <jpirko@redhat.com> | 2011-07-20 00:54:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-21 16:47:57 -0400 |
commit | ffcf9b767293ebc3e59e639cd4ec0dff5ca39798 (patch) | |
tree | b97e59ff1210a6fe15bac715f091612f320e1e55 /include/linux/if_vlan.h | |
parent | 7ff0bcf676f7ed224ce21b58c7858c8e527068b2 (diff) |
vlan: kill vlan_gro_frags and vlan_gro_receive
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/if_vlan.h')
-rw-r--r-- | include/linux/if_vlan.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index d81beced0dae..f40369e09f5c 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h | |||
@@ -127,12 +127,6 @@ extern u16 vlan_dev_vlan_id(const struct net_device *dev); | |||
127 | 127 | ||
128 | extern bool vlan_do_receive(struct sk_buff **skb); | 128 | extern bool vlan_do_receive(struct sk_buff **skb); |
129 | extern struct sk_buff *vlan_untag(struct sk_buff *skb); | 129 | extern struct sk_buff *vlan_untag(struct sk_buff *skb); |
130 | extern gro_result_t | ||
131 | vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp, | ||
132 | unsigned int vlan_tci, struct sk_buff *skb); | ||
133 | extern gro_result_t | ||
134 | vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp, | ||
135 | unsigned int vlan_tci); | ||
136 | 130 | ||
137 | #else | 131 | #else |
138 | static inline struct net_device * | 132 | static inline struct net_device * |
@@ -164,20 +158,6 @@ static inline struct sk_buff *vlan_untag(struct sk_buff *skb) | |||
164 | { | 158 | { |
165 | return skb; | 159 | return skb; |
166 | } | 160 | } |
167 | |||
168 | static inline gro_result_t | ||
169 | vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp, | ||
170 | unsigned int vlan_tci, struct sk_buff *skb) | ||
171 | { | ||
172 | return GRO_DROP; | ||
173 | } | ||
174 | |||
175 | static inline gro_result_t | ||
176 | vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp, | ||
177 | unsigned int vlan_tci) | ||
178 | { | ||
179 | return GRO_DROP; | ||
180 | } | ||
181 | #endif | 161 | #endif |
182 | 162 | ||
183 | /** | 163 | /** |