summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorChangli Gao <xiaosuo@gmail.com>2010-08-22 21:03:33 -0700
committerDavid S. Miller <davem@davemloft.net>2010-08-22 21:03:33 -0700
commit05532121da0728eaedac2a0a5c3cecad3a95d765 (patch)
tree1b1ff9e02b87527868c7698f0369d00d4c86a0a0 /include
parent2436243a39de56f03d38c74139261cc61bea8456 (diff)
downloadlinux-3.10-05532121da0728eaedac2a0a5c3cecad3a95d765.tar.gz
linux-3.10-05532121da0728eaedac2a0a5c3cecad3a95d765.tar.bz2
linux-3.10-05532121da0728eaedac2a0a5c3cecad3a95d765.zip
net: 802.1q: make vlan_hwaccel_do_receive() return void
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>
Diffstat (limited to 'include')
-rw-r--r--include/linux/if_vlan.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 3d870fda8c4..a52320751bf 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);
extern int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
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
vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
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;
}
-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