Update from 2.6.36 to 2.6.36.4wip-dissipation-jerickso

1 files changed, 3 insertions, 0 deletions

diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index 0eb96f7e44be..2dcff0be8acb 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -43,6 +43,9 @@ int vlan_hwaccel_do_receive(struct sk_buff *skb)
         struct net_device *dev = skb->dev;
         struct vlan_rx_stats     *rx_stats;
 
+        if (unlikely(!is_vlan_dev(dev)))
+                return 0;
+
         skb->dev = vlan_dev_info(dev)->real_dev;
         netif_nit_deliver(skb);