From b7bffa713de5f8e3b679dcf3ab70d16ed9853ac7 Mon Sep 17 00:00:00 2001 From: Yaroslav Tykhiy Date: Wed, 4 Apr 2001 15:10:58 +0000 Subject: [PATCH] Change the type of the VLAN interface from IFT_PROPVIRTUAL, which was a temporary hack, to IFT_L2VLAN, which is the type assigned by IANA. --- sys/net/if.c | 2 +- sys/net/if_vlan_var.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 08c4a1f24bc2..3e0cf0e6ed01 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1357,7 +1357,7 @@ if_setlladdr(struct ifnet *ifp, const u_char *lladdr, int len) case IFT_FDDI: case IFT_XETHER: case IFT_ISO88025: - case IFT_PROPVIRTUAL: /* XXX waiting for IFT_8021_VLAN */ + case IFT_L2VLAN: bcopy(lladdr, ((struct arpcom *)ifp->if_softc)->ac_enaddr, len); bcopy(lladdr, LLADDR(sdl), len); break; diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h index 8fbe10ca1ac9..cdb67bc0d70a 100644 --- a/sys/net/if_vlan_var.h +++ b/sys/net/if_vlan_var.h @@ -64,8 +64,8 @@ struct ether_vlan_header { #define EVL_PRIOFTAG(tag) (((tag) >> 13) & 7) #define EVL_ENCAPLEN 4 /* length in octets of encapsulation */ -/* When these sorts of interfaces get their own identifier... */ -#define IFT_8021_VLAN IFT_PROPVIRTUAL +/* 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