diff options
-rw-r--r-- | include/linux/if_vlan.h | 20 | ||||
-rw-r--r-- | net/8021q/vlan_core.c | 16 |
2 files changed, 0 insertions, 36 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 | /** |
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index 68b04ea5fa48..5f27f8e30254 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c | |||
@@ -96,22 +96,6 @@ u16 vlan_dev_vlan_id(const struct net_device *dev) | |||
96 | } | 96 | } |
97 | EXPORT_SYMBOL(vlan_dev_vlan_id); | 97 | EXPORT_SYMBOL(vlan_dev_vlan_id); |
98 | 98 | ||
99 | gro_result_t vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp, | ||
100 | unsigned int vlan_tci, struct sk_buff *skb) | ||
101 | { | ||
102 | __vlan_hwaccel_put_tag(skb, vlan_tci); | ||
103 | return napi_gro_receive(napi, skb); | ||
104 | } | ||
105 | EXPORT_SYMBOL(vlan_gro_receive); | ||
106 | |||
107 | gro_result_t vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp, | ||
108 | unsigned int vlan_tci) | ||
109 | { | ||
110 | __vlan_hwaccel_put_tag(napi->skb, vlan_tci); | ||
111 | return napi_gro_frags(napi); | ||
112 | } | ||
113 | EXPORT_SYMBOL(vlan_gro_frags); | ||
114 | |||
115 | static struct sk_buff *vlan_reorder_header(struct sk_buff *skb) | 99 | static struct sk_buff *vlan_reorder_header(struct sk_buff *skb) |
116 | { | 100 | { |
117 | if (skb_cow(skb, skb_headroom(skb)) < 0) | 101 | if (skb_cow(skb, skb_headroom(skb)) < 0) |