diff options
Diffstat (limited to 'include/linux/if_vlan.h')
-rw-r--r-- | include/linux/if_vlan.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 13aff1e2183b..a810987cb80e 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h | |||
@@ -17,11 +17,11 @@ | |||
17 | #include <linux/netdevice.h> | 17 | #include <linux/netdevice.h> |
18 | #include <linux/etherdevice.h> | 18 | #include <linux/etherdevice.h> |
19 | #include <linux/rtnetlink.h> | 19 | #include <linux/rtnetlink.h> |
20 | #include <linux/bug.h> | ||
20 | 21 | ||
21 | #define VLAN_HLEN 4 /* The additional bytes (on top of the Ethernet header) | 22 | #define VLAN_HLEN 4 /* The additional bytes required by VLAN |
22 | * that VLAN requires. | 23 | * (in addition to the Ethernet header) |
23 | */ | 24 | */ |
24 | #define VLAN_ETH_ALEN 6 /* Octets in one ethernet addr */ | ||
25 | #define VLAN_ETH_HLEN 18 /* Total octets in header. */ | 25 | #define VLAN_ETH_HLEN 18 /* Total octets in header. */ |
26 | #define VLAN_ETH_ZLEN 64 /* Min. octets in frame sans FCS */ | 26 | #define VLAN_ETH_ZLEN 64 /* Min. octets in frame sans FCS */ |
27 | 27 | ||
@@ -177,7 +177,7 @@ static inline struct sk_buff *vlan_insert_tag(struct sk_buff *skb, u16 vlan_tci) | |||
177 | veth = (struct vlan_ethhdr *)skb_push(skb, VLAN_HLEN); | 177 | veth = (struct vlan_ethhdr *)skb_push(skb, VLAN_HLEN); |
178 | 178 | ||
179 | /* Move the mac addresses to the beginning of the new header. */ | 179 | /* Move the mac addresses to the beginning of the new header. */ |
180 | memmove(skb->data, skb->data + VLAN_HLEN, 2 * VLAN_ETH_ALEN); | 180 | memmove(skb->data, skb->data + VLAN_HLEN, 2 * ETH_ALEN); |
181 | skb->mac_header -= VLAN_HLEN; | 181 | skb->mac_header -= VLAN_HLEN; |
182 | 182 | ||
183 | /* first, the ethernet type */ | 183 | /* first, the ethernet type */ |