leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: 802.1q: make vlan_hwaccel_do_receive() return void

Browse Source 
vlan_hwaccel_do_receive() always returns 0, so make it return void.

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Changli Gao 2010-08-22 21:03:33 -07:00 committed by David S. Miller
parent 2436243a39
commit 05532121da
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/if_vlan.h
View File

@ -119,7 +119,7 @@ extern u16 vlan_dev_vlan_id(const struct net_device *dev);
extern int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp, extern int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
u16 vlan_tci, int polling); u16 vlan_tci, int polling);
extern int vlan_hwaccel_do_receive(struct sk_buff *skb); extern void vlan_hwaccel_do_receive(struct sk_buff *skb);
extern gro_result_t extern gro_result_t
vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp, vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
unsigned int vlan_tci, struct sk_buff *skb); 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,
return NET_XMIT_SUCCESS; return NET_XMIT_SUCCESS;
} }
static inline int vlan_hwaccel_do_receive(struct sk_buff *skb) static inline void vlan_hwaccel_do_receive(struct sk_buff *skb)
{ {
return 0;
} }
static inline gro_result_t static inline gro_result_t

3
net/8021q/vlan_core.c
View File

@ -35,7 +35,7 @@ drop:
} }
EXPORT_SYMBOL(__vlan_hwaccel_rx); EXPORT_SYMBOL(__vlan_hwaccel_rx);
int vlan_hwaccel_do_receive(struct sk_buff *skb) void vlan_hwaccel_do_receive(struct sk_buff *skb)
{ {
struct net_device *dev = skb->dev; struct net_device *dev = skb->dev;
struct vlan_rx_stats *rx_stats; struct vlan_rx_stats *rx_stats;
@ -69,7 +69,6 @@ int vlan_hwaccel_do_receive(struct sk_buff *skb)
break; break;
} }
u64_stats_update_end(&rx_stats->syncp); u64_stats_update_end(&rx_stats->syncp);
return 0;
} }
struct net_device *vlan_dev_real_dev(const struct net_device *dev) struct net_device *vlan_dev_real_dev(const struct net_device *dev)

4
net/core/dev.c
View File

@ -2841,8 +2841,8 @@ static int __netif_receive_skb(struct sk_buff *skb)
if (!netdev_tstamp_prequeue) if (!netdev_tstamp_prequeue)
net_timestamp_check(skb); net_timestamp_check(skb);
if (vlan_tx_tag_present(skb) && vlan_hwaccel_do_receive(skb)) if (vlan_tx_tag_present(skb))
return NET_RX_SUCCESS; vlan_hwaccel_do_receive(skb);
/* if we've gotten here through NAPI, check netpoll */ /* if we've gotten here through NAPI, check netpoll */
if (netpoll_receive_skb(skb)) if (netpoll_receive_skb(skb))