net: fix packet socket delivery in rx irq handler

[karo-tx-linux.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index 0ae08d3f57e79730ac893dbb8a046a6678cd622a..f7a30f2e53703426b1f45dd848f25e443df90930 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2187,6 +2187,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;
@@ -3990,7 +3993,7 @@ int register_netdevice(struct net_device *dev)
                dev->features &= ~NETIF_F_TSO;
        }
        if (dev->features & NETIF_F_UFO) {
-               if (!(dev->features & NETIF_F_HW_CSUM)) {
+               if (!(dev->features & NETIF_F_GEN_CSUM)) {
                        printk(KERN_ERR "%s: Dropping NETIF_F_UFO since no "
                                        "NETIF_F_HW_CSUM feature.\n",
                                                        dev->name);