d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the IANA assignment IFT_L2VLAN directly instead of indirecting through

Browse Source 
a privately #defined IFT_8021_VLAN.

MFC after:	3 days
This commit is contained in:
Bill Fenner 2001-07-24 00:03:51 +00:00
parent 78e5e964ab
commit d2a75853a2
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/net/if_vlan.c
View File

@ -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;
}
}

3
sys/net/if_vlan_var.h
View File

@ -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