[ovs-dev] [PATCH] linux/compat/include/linux/if_vlan.h: use ETH_ALEN instead of VLAN_ETH_ALEN

Isaku Yamahata yamahata at valinux.co.jp
Thu Jun 21 02:25:44 UTC 2012


VLAN_ETH_ALEN is deleted by a3f671b3152919e72af261333402c0f1272bdf59
in the linux upstream.

Signed-off-by: Isaku Yamahata <yamahata at valinux.co.jp>
---
 datapath/linux/compat/include/linux/if_vlan.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/datapath/linux/compat/include/linux/if_vlan.h b/datapath/linux/compat/include/linux/if_vlan.h
index ded61b9..53e123a 100644
--- a/datapath/linux/compat/include/linux/if_vlan.h
+++ b/datapath/linux/compat/include/linux/if_vlan.h
@@ -69,7 +69,7 @@ __vlan_put_qinq_tag(struct sk_buff *skb, u16 vlan_tci)
 	veth = (struct vlan_ethhdr *)skb_push(skb, VLAN_HLEN);
 
 	/* Move the mac addresses to the beginning of the new header. */
-	memmove(skb->data, skb->data + VLAN_HLEN, 2 * VLAN_ETH_ALEN);
+	memmove(skb->data, skb->data + VLAN_HLEN, 2 * ETH_ALEN);
 	skb->mac_header -= VLAN_HLEN;
 
 	/* first, the ethernet type */
-- 
1.7.1.1




More information about the dev mailing list