linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / 8021q / vlan_dev.c

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index da9cfe9..0f604d2 100644 (file)
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -163,8 +163,10 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
        stats->rx_packets++;
        stats->rx_bytes += skb->len;
 
-       /* Take off the VLAN header (4 bytes currently) */
-       skb_pull_rcsum(skb, VLAN_HLEN);
+       skb_pull(skb, VLAN_HLEN); /* take off the VLAN header (4 bytes currently) */
+
+       /* Need to correct hardware checksum */
+       skb_postpull_rcsum(skb, vhdr, VLAN_HLEN);
 
        /* Ok, lets check to make sure the device (dev) we
         * came in on is what this VLAN is attached to.