diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-11-11 09:16:20 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-11 09:16:20 +0100 |
| commit | 45b86a96f17cb2900f291129b0e67287400e45b2 (patch) | |
| tree | f7968bf36e3947ee42251f7eebc6ea5f24aca202 /net/core/dev.c | |
| parent | ftrace: fix breakage in bin_fmt results (diff) | |
| parent | ring-buffer: prevent infinite looping on time stamping (diff) | |
| download | wireguard-linux-45b86a96f17cb2900f291129b0e67287400e45b2.tar.xz wireguard-linux-45b86a96f17cb2900f291129b0e67287400e45b2.zip | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to '')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index d9038e328cc1..9174c77d3112 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2218,6 +2218,9 @@ int netif_receive_skb(struct sk_buff *skb) int ret = NET_RX_DROP; __be16 type; + if (skb->vlan_tci && vlan_hwaccel_do_receive(skb)) + return NET_RX_SUCCESS; + /* if we've gotten here through NAPI, check netpoll */ if (netpoll_receive_skb(skb)) return NET_RX_DROP; |