summaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
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 /net/core/dev.c
parent2436243a39de56f03d38c74139261cc61bea8456 (diff)
downloadlinux-05532121da0728eaedac2a0a5c3cecad3a95d765.tar.gz
linux-05532121da0728eaedac2a0a5c3cecad3a95d765.tar.bz2
linux-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 'net/core/dev.c')
-rw-r--r--net/core/dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 7cd5237d9822..d569f88bcf80 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2841,8 +2841,8 @@ static int __netif_receive_skb(struct sk_buff *skb)
if (!netdev_tstamp_prequeue)
net_timestamp_check(skb);
- if (vlan_tx_tag_present(skb) && vlan_hwaccel_do_receive(skb))
- return NET_RX_SUCCESS;
+ if (vlan_tx_tag_present(skb))
+ vlan_hwaccel_do_receive(skb);
/* if we've gotten here through NAPI, check netpoll */
if (netpoll_receive_skb(skb))