diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-07-20 04:54:42 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-21 13:47:57 -0700 |
| commit | ffcf9b767293ebc3e59e639cd4ec0dff5ca39798 (patch) | |
| tree | b97e59ff1210a6fe15bac715f091612f320e1e55 | |
| parent | 7ff0bcf676f7ed224ce21b58c7858c8e527068b2 (diff) | |
| download | kernel-common-ffcf9b767293ebc3e59e639cd4ec0dff5ca39798.tar.gz kernel-common-ffcf9b767293ebc3e59e639cd4ec0dff5ca39798.tar.bz2 kernel-common-ffcf9b767293ebc3e59e639cd4ec0dff5ca39798.zip | |
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>
| -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); extern bool vlan_do_receive(struct sk_buff **skb); extern struct sk_buff *vlan_untag(struct sk_buff *skb); -extern gro_result_t -vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp, - unsigned int vlan_tci, struct sk_buff *skb); -extern gro_result_t -vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp, - unsigned int vlan_tci); #else static inline struct net_device * @@ -164,20 +158,6 @@ static inline struct sk_buff *vlan_untag(struct sk_buff *skb) { return skb; } - -static inline gro_result_t -vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp, - unsigned int vlan_tci, struct sk_buff *skb) -{ - return GRO_DROP; -} - -static inline gro_result_t -vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp, - unsigned int vlan_tci) -{ - return GRO_DROP; -} #endif /** 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) } EXPORT_SYMBOL(vlan_dev_vlan_id); -gro_result_t vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp, - unsigned int vlan_tci, struct sk_buff *skb) -{ - __vlan_hwaccel_put_tag(skb, vlan_tci); - return napi_gro_receive(napi, skb); -} -EXPORT_SYMBOL(vlan_gro_receive); - -gro_result_t vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp, - unsigned int vlan_tci) -{ - __vlan_hwaccel_put_tag(napi->skb, vlan_tci); - return napi_gro_frags(napi); -} -EXPORT_SYMBOL(vlan_gro_frags); - static struct sk_buff *vlan_reorder_header(struct sk_buff *skb) { if (skb_cow(skb, skb_headroom(skb)) < 0) |