diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-04-24 10:16:11 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-04-24 10:16:11 +0000 |
| commit | 583ac56e4f017424b4522954e2dfa5a7277b4d50 (patch) | |
| tree | 455c0209d981e7e2d8ff378ed88dad9f013b7a79 | |
| parent | 203f31df80ad80fa7589d25faf9e164f6f01829d (diff) | |
Use the IANA assignment IFT_L2VLAN.
From FreeBSD/NetBSD
Tested by camield@ and Alexey E. Suslikov <cruel at texnika dot com dot ua>
ok camield@
| -rw-r--r-- | sys/net/if_vlan.c | 5 | ||||
| -rw-r--r-- | sys/net/if_vlan_var.h | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index dfb34bc08f7..eb302cc7375 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1,4 +1,5 @@ -/* $OpenBSD: if_vlan.c,v 1.52 2005/04/20 23:02:22 mpf Exp $ */ +/* $OpenBSD: if_vlan.c,v 1.53 2005/04/24 10:16:10 brad Exp $ */ + /* * Copyright 1998 Massachusetts Institute of Technology * @@ -140,7 +141,7 @@ vlan_clone_create(struct if_clone *ifc, int unit) if_attach(ifp); ether_ifattach(ifp); /* Now undo some of the damage... */ - ifp->if_type = IFT_8021_VLAN; + ifp->if_type = IFT_L2VLAN; ifp->if_hdrlen = EVL_ENCAPLEN; return (0); diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h index 9277f1bbd83..979387b3c4a 100644 --- a/sys/net/if_vlan_var.h +++ b/sys/net/if_vlan_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vlan_var.h,v 1.13 2005/04/20 23:02:22 mpf Exp $ */ +/* $OpenBSD: if_vlan_var.h,v 1.14 2005/04/24 10:16:10 brad Exp $ */ /* * Copyright 1998 Massachusetts Institute of Technology @@ -77,9 +77,6 @@ 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 - /* sysctl(3) tags, for compatibility purposes */ #define VLANCTL_PROTO 1 #define VLANCTL_MAX 2 |