diff options
| author | fenner <fenner@FreeBSD.org> | 2001-07-24 00:03:51 +0000 |
|---|---|---|
| committer | fenner <fenner@FreeBSD.org> | 2001-07-24 00:03:51 +0000 |
| commit | f400013872fd896640ebdd44832347b142e67ffa (patch) | |
| tree | 55d8c5e1feeaae4df0bf5d3f1005a43c0b62bff1 /sys/net | |
| parent | 512f80778aa48088e2aef2872fbf4d9987bc383c (diff) | |
| download | FreeBSD-src-f400013872fd896640ebdd44832347b142e67ffa.zip FreeBSD-src-f400013872fd896640ebdd44832347b142e67ffa.tar.gz | |
Use the IANA assignment IFT_L2VLAN directly instead of indirecting through
a privately #defined IFT_8021_VLAN.
MFC after: 3 days
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_vlan.c | 4 | ||||
| -rw-r--r-- | sys/net/if_vlan_var.h | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 0a1633d..e57dfb9 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -82,7 +82,7 @@ #endif SYSCTL_DECL(_net_link); -SYSCTL_NODE(_net_link, IFT_8021_VLAN, vlan, CTLFLAG_RW, 0, "IEEE 802.1Q VLAN"); +SYSCTL_NODE(_net_link, IFT_L2VLAN, vlan, CTLFLAG_RW, 0, "IEEE 802.1Q VLAN"); SYSCTL_NODE(_net_link_vlan, PF_LINK, link, CTLFLAG_RW, 0, "for consistency"); u_int vlan_proto = ETHERTYPE_VLAN; @@ -179,7 +179,7 @@ vlaninit(void) ifp->if_snd.ifq_maxlen = ifqmaxlen; ether_ifattach(ifp, ETHER_BPF_SUPPORTED); /* Now undo some of the damage... */ - ifp->if_data.ifi_type = IFT_8021_VLAN; + ifp->if_data.ifi_type = IFT_L2VLAN; ifp->if_data.ifi_hdrlen = EVL_ENCAPLEN; } } diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h index cdb67bc..ca7f5ad 100644 --- a/sys/net/if_vlan_var.h +++ b/sys/net/if_vlan_var.h @@ -64,9 +64,6 @@ struct ether_vlan_header { #define EVL_PRIOFTAG(tag) (((tag) >> 13) & 7) #define EVL_ENCAPLEN 4 /* length in octets of encapsulation */ -/* These sorts of interfaces got their own identifier from IANA */ -#define IFT_8021_VLAN IFT_L2VLAN - /* sysctl(3) tags, for compatibility purposes */ #define VLANCTL_PROTO 1 #define VLANCTL_MAX 2 |
