commit e4dd61882e2cfe47ea72ecd825671e8e5ae29038

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Jarek Poplawski and committed by

David S. Miller 17 years ago e4dd6188 ce03aadd

1 changed file

expand all

unified split

include

linux

if_vlan.h

include/linux/if_vlan.h

··· 210 211 /* Move the mac addresses to the beginning of the new header. */ 212 memmove(skb->data, skb->data + VLAN_HLEN, 2 * VLAN_ETH_ALEN); 213 214 /* first, the ethernet type */ 215 veth->h_vlan_proto = htons(ETH_P_8021Q);

··· 210 211 /* Move the mac addresses to the beginning of the new header. */ 212 memmove(skb->data, skb->data + VLAN_HLEN, 2 * VLAN_ETH_ALEN); 213 + skb->mac_header -= VLAN_HLEN; 214 215 /* first, the ethernet type */ 216 veth->h_vlan_proto = htons(ETH_P_8021Q);