diff options
Diffstat (limited to 'include/linux/if_vlan.h')
-rw-r--r-- | include/linux/if_vlan.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 3d870fda8c4f..a52320751bfc 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h | |||
@@ -119,7 +119,7 @@ extern u16 vlan_dev_vlan_id(const struct net_device *dev); | |||
119 | 119 | ||
120 | extern int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp, | 120 | extern int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp, |
121 | u16 vlan_tci, int polling); | 121 | u16 vlan_tci, int polling); |
122 | extern int vlan_hwaccel_do_receive(struct sk_buff *skb); | 122 | extern void vlan_hwaccel_do_receive(struct sk_buff *skb); |
123 | extern gro_result_t | 123 | extern gro_result_t |
124 | vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp, | 124 | vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp, |
125 | unsigned int vlan_tci, struct sk_buff *skb); | 125 | unsigned int vlan_tci, struct sk_buff *skb); |
@@ -147,9 +147,8 @@ static inline int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp, | |||
147 | return NET_XMIT_SUCCESS; | 147 | return NET_XMIT_SUCCESS; |
148 | } | 148 | } |
149 | 149 | ||
150 | static inline int vlan_hwaccel_do_receive(struct sk_buff *skb) | 150 | static inline void vlan_hwaccel_do_receive(struct sk_buff *skb) |
151 | { | 151 | { |
152 | return 0; | ||
153 | } | 152 | } |
154 | 153 | ||
155 | static inline gro_result_t | 154 | static inline gro_result_t |