From 4d671eeb5635c373981ee18a4784c11054e3424f Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 21 Dec 2005 11:24:46 -0800 Subject: [PATCH] Add VLAN checksumming fix, fwd from DaveM --- queue/fix-vlan-checksumming.patch | 36 +++++++++++++++++++++++++++++++ queue/series | 1 + 2 files changed, 37 insertions(+) create mode 100644 queue/fix-vlan-checksumming.patch diff --git a/queue/fix-vlan-checksumming.patch b/queue/fix-vlan-checksumming.patch new file mode 100644 index 00000000000..46c073670d0 --- /dev/null +++ b/queue/fix-vlan-checksumming.patch @@ -0,0 +1,36 @@ +From chrisw@osdl.org Wed Dec 21 09:28:06 2005 +Date: Wed, 14 Dec 2005 16:29:02 -0800 (PST) +Message-Id: <20051214.162902.42775251.davem@davemloft.net> +To: stable@kernel.org +From: "David S. Miller" +Cc: shemminger@osdl.org +Subject: [VLAN]: Fix hardware rx csum errors + +From: Stephen Hemminger + +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 +Signed-off-by: Chris Wright +--- + + net/8021q/vlan_dev.c | 3 +++ + 1 files changed, 3 insertions(+) + +Index: linux-2.6.14.y/net/8021q/vlan_dev.c +=================================================================== +--- linux-2.6.14.y.orig/net/8021q/vlan_dev.c ++++ linux-2.6.14.y/net/8021q/vlan_dev.c +@@ -165,6 +165,9 @@ int vlan_skb_recv(struct sk_buff *skb, s + + 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. + */ diff --git a/queue/series b/queue/series index 074bfc4adac..51d3bfd59f6 100644 --- a/queue/series +++ b/queue/series @@ -5,3 +5,4 @@ fix-unbalanced-read_unlock_bh-in-ctnetlink.patch acpi-fix-null-deref-in-video-lcd-brightness.patch dpt_i2o-fix-for-deadlock-condition.patch gre-fix-hardware-checksum-modification.patch +fix-vlan-checksumming.patch -- 2.47.3