From: Simon Horman Date: Thu, 19 Apr 2012 07:38:39 +0000 (+0900) Subject: datapath: Use ETH_ALEN instead of VLAN_ETH_ALEN X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d192f8e5655cbffe50356f46bd8fd8c3e8875b0;p=openvswitch datapath: Use ETH_ALEN instead of VLAN_ETH_ALEN VLAN_ETH_ALEN will be removed in version 3.5 of the Linux kernel. Signed-off-by: Simon Horman Signed-off-by: Jesse Gross --- diff --git a/datapath/linux/compat/include/linux/if_vlan.h b/datapath/linux/compat/include/linux/if_vlan.h index 66ed0583..dc4b15e3 100644 --- a/datapath/linux/compat/include/linux/if_vlan.h +++ b/datapath/linux/compat/include/linux/if_vlan.h @@ -31,7 +31,7 @@ static inline struct sk_buff *__vlan_put_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 */