diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 22:04:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 22:04:48 +0100 |
| commit | 78f902ccc597d6ce3e8d1477d70f2d79e960ba7a (patch) | |
| tree | c6ceab663de16501d1dda1c1596fe2dacaaef8e3 /net/core/dev.c | |
| parent | 9ee670fd87b7d69c8633b94c42aadcbbcb96f28e (diff) | |
| parent | 8b1fae4e4200388b64dd88065639413cb3f1051c (diff) | |
| download | lwn-78f902ccc597d6ce3e8d1477d70f2d79e960ba7a.tar.gz lwn-78f902ccc597d6ce3e8d1477d70f2d79e960ba7a.zip | |
Merge commit 'v2.6.28-rc8' into x86/doc
Diffstat (limited to 'net/core/dev.c')
| -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; |