Move struct ether_vlan_header to ethernet.h, out of if_vlan_var.h,

since this structure is protocol definition, not part of implementation.

diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h
index 10abf641d9fc4a87a205e7329176963c73d22307..438028d15675eff7a1dede1fa8c39e7ea1d9f045 100644 (file)
--- a/sys/net/ethernet.h
+++ b/sys/net/ethernet.h
@@ -72,6 +72,25 @@ struct ether_addr {
 
 #define        ETHER_IS_MULTICAST(addr) (*(addr) & 0x01) /* is address mcast/bcast? */
 
+/*
+ * 802.1q Virtual LAN header.
+ */
+struct ether_vlan_header {
+       uint8_t evl_dhost[ETHER_ADDR_LEN];
+       uint8_t evl_shost[ETHER_ADDR_LEN];
+       uint16_t evl_encap_proto;
+       uint16_t evl_tag;
+       uint16_t evl_proto;
+} __packed;
+
+#define        EVL_VLID_MASK           0x0FFF
+#define        EVL_PRI_MASK            0xE000
+#define        EVL_VLANOFTAG(tag)      ((tag) & EVL_VLID_MASK)
+#define        EVL_PRIOFTAG(tag)       (((tag) >> 13) & 7)
+#define        EVL_CFIOFTAG(tag)       (((tag) >> 12) & 1)
+#define        EVL_MAKETAG(vlid, pri, cfi)                                     \
+       ((((((pri) & 7) << 1) | ((cfi) & 1)) << 12) | ((vlid) & EVL_VLID_MASK))
+
 /*
  *  NOTE: 0x0000-0x05DC (0..1500) are generally IEEE 802.3 length fields.
  *  However, there are some conflicts.

diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h
index b24087435da2605a7e916b44ecd09fd4c0b1f83f..ed4753ecfe454da1d28d7652acf567c52c8dbcae 100644 (file)
--- a/sys/net/if_vlan_var.h
+++ b/sys/net/if_vlan_var.h
@@ -32,22 +32,6 @@
 #ifndef _NET_IF_VLAN_VAR_H_
 #define        _NET_IF_VLAN_VAR_H_     1
 
-struct ether_vlan_header {
-       u_char  evl_dhost[ETHER_ADDR_LEN];
-       u_char  evl_shost[ETHER_ADDR_LEN];
-       u_int16_t evl_encap_proto;
-       u_int16_t evl_tag;
-       u_int16_t evl_proto;
-};
-
-#define        EVL_VLID_MASK           0x0FFF
-#define        EVL_PRI_MASK            0xE000
-#define        EVL_VLANOFTAG(tag)      ((tag) & EVL_VLID_MASK)
-#define        EVL_PRIOFTAG(tag)       (((tag) >> 13) & 7)
-#define        EVL_CFIOFTAG(tag)       (((tag) >> 12) & 1)
-#define        EVL_MAKETAG(vlid, pri, cfi)                                     \
-       ((((((pri) & 7) << 1) | ((cfi) & 1)) << 12) | ((vlid) & EVL_VLID_MASK))
-
 /* Set the VLAN ID in an mbuf packet header non-destructively. */
 #define EVL_APPLY_VLID(m, vlid)                                                \
        do {                                                            \