[PATCH] Swap Migration V5: MPOL_MF_MOVE interface

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

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 145f5cd..f2a8750 100644 (file)
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -120,7 +120,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
        unsigned short vid;
        struct net_device_stats *stats;
        unsigned short vlan_TCI;
-       unsigned short proto;
+       __be16 proto;
 
        /* vlan_TCI = ntohs(get_unaligned(&vhdr->h_vlan_TCI)); */
        vlan_TCI = ntohs(vhdr->h_vlan_TCI);
@@ -165,6 +165,9 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
 
        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.
         */