Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3f671b3 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

if_vlan: Remove VLAN_ETH_ALEN define and the 1 use of it 



Just use ETH_ALEN.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c8628155

include/linux/if_vlan.h

+3 −4
Original line number Diff line number Diff line
@@ -18,10 +18,9 @@ 
#include <linux/etherdevice.h>

#include <linux/rtnetlink.h>



#define VLAN_HLEN	4		/* The additional bytes (on top of the Ethernet header)

					 * that VLAN requires.

#define VLAN_HLEN	4		/* The additional bytes required by VLAN

					 * (in addition to the Ethernet header)

					 */

#define VLAN_ETH_ALEN	6		/* Octets in one ethernet addr	 */

#define VLAN_ETH_HLEN	18		/* Total octets in header.	 */

#define VLAN_ETH_ZLEN	64		/* Min. octets in frame sans FCS */
@@ -177,7 +176,7 @@ static inline struct sk_buff *vlan_insert_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 */