diff --git a/[refs] b/[refs] index f9cf4d60cb9f..dd5e318a95a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce03aaddd4d67371494b36c8e8a57bc789e934d6 +refs/heads/master: e4dd61882e2cfe47ea72ecd825671e8e5ae29038 diff --git a/trunk/include/linux/if_vlan.h b/trunk/include/linux/if_vlan.h index f8ff918c208f..e1ff5b14310e 100644 --- a/trunk/include/linux/if_vlan.h +++ b/trunk/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);