diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-19 15:54:50 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-19 15:54:50 +0000 |
| commit | 0fc24c1ebff281406d66840cbaa6d303bc2cae24 (patch) | |
| tree | b3cacbb64fa31671d2f6241f38b5dd31db4a643a /net/core/dev.c | |
| parent | b9914406fb128bee01b2a23a35eafbc83ff915f0 (diff) | |
| parent | 18aa04d882fe72eb59ea2c9e3f78400d85b6535f (diff) | |
Merge branch 'rmk-next' into s3c64xx
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 d9038e328cc..9174c77d311 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; |