From: Stephen Hemminger Date: Thu, 15 Dec 2005 00:23:16 +0000 (-0800) Subject: [VLAN]: Fix hardware rx csum errors X-Git-Tag: v2.6.15-rc6~61^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a388442c3798a345d131ff8b9d6dea0bfda3fefc;p=linux-2.6-omap-h63xx.git [VLAN]: Fix hardware rx csum errors Receiving VLAN packets over a device (without VLAN assist) that is doing hardware checksumming (CHECKSUM_HW), causes errors because the VLAN code forgets to adjust the hardware checksum. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller --- diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index b7486488967..f2a8750bbf1 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -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. */