summaryrefslogtreecommitdiff
path: root/sys/net/if_vlan_var.h
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2016-03-14 03:48:48 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2016-03-14 03:48:48 +0000
commitf3453bbfc7ead24852eade3f4d681524931b5394 (patch)
treebf99411358468c163257caad9eb79c2c09c46aff /sys/net/if_vlan_var.h
parent4f8e5548629d5e953b4b290d8e033b7e9d6769d1 (diff)
move the vlan protocol definitions to the same places as the ethernet ones
ok mpi@
Diffstat (limited to 'sys/net/if_vlan_var.h')
-rw-r--r--sys/net/if_vlan_var.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h
index ef33d4374ee..d93a928406f 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.32 2016/03/03 09:27:51 dlg Exp $ */
+/* $OpenBSD: if_vlan_var.h,v 1.33 2016/03/14 03:48:47 dlg Exp $ */
/*
* Copyright 1998 Massachusetts Institute of Technology
@@ -34,21 +34,6 @@
#ifndef _NET_IF_VLAN_VAR_H_
#define _NET_IF_VLAN_VAR_H_
-struct ether_vlan_header {
- u_char evl_dhost[ETHER_ADDR_LEN];
- u_char evl_shost[ETHER_ADDR_LEN];
- u_int16_t evl_encap_proto;
- u_int16_t evl_tag;
- u_int16_t evl_proto;
-};
-
-#define EVL_VLID_MASK 0x0FFF
-#define EVL_VLANOFTAG(tag) ((tag) & EVL_VLID_MASK)
-#define EVL_PRIOFTAG(tag) (((tag) >> EVL_PRIO_BITS) & 7)
-#define EVL_ENCAPLEN 4 /* length in octets of encapsulation */
-#define EVL_PRIO_MAX 7
-#define EVL_PRIO_BITS 13
-
/* sysctl(3) tags, for compatibility purposes */
#define VLANCTL_PROTO 1
#define VLANCTL_MAX 2