diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /net/8021q/vlan_dev.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
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. |