diff options
author | yar <yar@FreeBSD.org> | 2001-04-04 15:10:58 +0000 |
---|---|---|
committer | yar <yar@FreeBSD.org> | 2001-04-04 15:10:58 +0000 |
commit | adae17d5bf48546669c88a8a76d86d7655975e3c (patch) | |
tree | 6761981ab9a1287ff9386680814c05d3b9161931 /sys/net | |
parent | 3750cde6a8a833ee5ed5d9ec16c64e7e24f0b943 (diff) | |
download | FreeBSD-src-adae17d5bf48546669c88a8a76d86d7655975e3c.zip FreeBSD-src-adae17d5bf48546669c88a8a76d86d7655975e3c.tar.gz |
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.
Diffstat (limited to 'sys/net')
-rw-r--r-- | sys/net/if.c | 2 | ||||
-rw-r--r-- | 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 08c4a1f2..3e0cf0e 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 8fbe10c..cdb67bc 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 |