diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 05:02:08 -0500 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 05:02:08 -0500 |
| commit | 5501972e0b5857bc8354770d900ceb9b40c7f6b7 (patch) | |
| tree | ff239422827c4cd54d2998f8851304255de31b38 /net/8021q/vlan_dev.c | |
| parent | 9d2f928ddf64ca0361562e30faf584cd33055c60 (diff) | |
| parent | e952f31bce6e9f64db01f607abc46529ba57ac9e (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'net/8021q/vlan_dev.c')
| -rw-r--r-- | net/8021q/vlan_dev.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 0f604d227da2..da9cfe927158 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
| @@ -163,10 +163,8 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, | |||
| 163 | stats->rx_packets++; | 163 | stats->rx_packets++; |
| 164 | stats->rx_bytes += skb->len; | 164 | stats->rx_bytes += skb->len; |
| 165 | 165 | ||
| 166 | skb_pull(skb, VLAN_HLEN); /* take off the VLAN header (4 bytes currently) */ | 166 | /* Take off the VLAN header (4 bytes currently) */ |
| 167 | 167 | skb_pull_rcsum(skb, VLAN_HLEN); | |
| 168 | /* Need to correct hardware checksum */ | ||
| 169 | skb_postpull_rcsum(skb, vhdr, VLAN_HLEN); | ||
| 170 | 168 | ||
| 171 | /* Ok, lets check to make sure the device (dev) we | 169 | /* Ok, lets check to make sure the device (dev) we |
| 172 | * came in on is what this VLAN is attached to. | 170 | * came in on is what this VLAN is attached to. |