diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2005-12-15 01:23:16 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-12-15 01:23:16 +0100 |
| commit | a388442c3798a345d131ff8b9d6dea0bfda3fefc (patch) | |
| tree | 9c7496cdbc56e6ca0ea17d18ef7feb723606b2e2 /net/8021q | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 (diff) | |
| download | linux-a388442c3798a345d131ff8b9d6dea0bfda3fefc.tar.xz linux-a388442c3798a345d131ff8b9d6dea0bfda3fefc.zip | |
[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 <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_dev.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index b74864889670..f2a8750bbf1d 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. */ |