X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=net%2Fcore%2Fdev.c;h=9174c77d3112c65237cbbd2e063eb55b03b5c39e;hb=6209344f5a3795d34b7f2c0061f49802283b6bdd;hp=d9038e328cc153b2257330934bacd78b12e0f3f1;hpb=9fb3c5ca3dabe06758c35f790c68e273ed749e19;p=linux-2.6-omap-h63xx.git

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;