diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-03-10 02:17:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-03-10 02:17:26 -0400 |
| commit | e161183ba674f97fce748384f5bb037d07bdc5c9 (patch) | |
| tree | 5b3bd4b995f6435ee977b71082244fa1a647f717 /include/linux/if_vlan.h | |
| parent | 2ef7f0dab6b3d171b6aff00a47077385ae3155b5 (diff) | |
| parent | 99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/if_vlan.h')
| -rw-r--r-- | include/linux/if_vlan.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index f8ff918c208f..e1ff5b14310e 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) | |||
| 210 | 210 | ||
| 211 | /* Move the mac addresses to the beginning of the new header. */ | 211 | /* Move the mac addresses to the beginning of the new header. */ |
| 212 | memmove(skb->data, skb->data + VLAN_HLEN, 2 * VLAN_ETH_ALEN); | 212 | memmove(skb->data, skb->data + VLAN_HLEN, 2 * VLAN_ETH_ALEN); |
| 213 | skb->mac_header -= VLAN_HLEN; | ||
| 213 | 214 | ||
| 214 | /* first, the ethernet type */ | 215 | /* first, the ethernet type */ |
| 215 | veth->h_vlan_proto = htons(ETH_P_8021Q); | 216 | veth->h_vlan_proto = htons(ETH_P_8021Q); |