summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarek Poplawski <jarkao2@gmail.com>2009-02-18 23:31:11 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-18 23:31:11 -0800
commite4dd61882e2cfe47ea72ecd825671e8e5ae29038 (patch)
tree10ea65c6294aa1e2de304c4b14c828e1c42fc1d7
parentce03aaddd4d67371494b36c8e8a57bc789e934d6 (diff)
downloadlinux-3.10-e4dd61882e2cfe47ea72ecd825671e8e5ae29038.tar.gz
linux-3.10-e4dd61882e2cfe47ea72ecd825671e8e5ae29038.tar.bz2
linux-3.10-e4dd61882e2cfe47ea72ecd825671e8e5ae29038.zip
vlan: Update skb->mac_header in __vlan_put_tag().
After moving mac addresses in __vlan_put_tag() skb->mac_header needs to be updated. Reported-by: Karl Hiramoto <karl@hiramoto.org> Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/if_vlan.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index f8ff918c208..e1ff5b14310 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -210,6 +210,7 @@ static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, u16 vlan_tci)
/* Move the mac addresses to the beginning of the new header. */
memmove(skb->data, skb->data + VLAN_HLEN, 2 * VLAN_ETH_ALEN);
+ skb->mac_header -= VLAN_HLEN;
/* first, the ethernet type */
veth->h_vlan_proto = htons(ETH_P_8021Q);