From 199d31a20f95babd74d692beb89988e2fb851032 Mon Sep 17 00:00:00 2001 From: fnm3 Date: Fri, 14 Jun 2002 17:28:13 +0000 Subject: New parameter definitions addded Kernelspace changes for encapsulated protocol parameter Version changed Updated VLAN match extension section Removed empty lines at end of file Userspace changes - vlan encapsulated protocol match added --- kernel/linux/include/linux/netfilter_bridge/ebt_vlan.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'kernel/linux/include/linux') diff --git a/kernel/linux/include/linux/netfilter_bridge/ebt_vlan.h b/kernel/linux/include/linux/netfilter_bridge/ebt_vlan.h index 079112b..8dc5bd9 100644 --- a/kernel/linux/include/linux/netfilter_bridge/ebt_vlan.h +++ b/kernel/linux/include/linux/netfilter_bridge/ebt_vlan.h @@ -3,14 +3,16 @@ #define EBT_VLAN_ID 0x01 #define EBT_VLAN_PRIO 0x02 -#define EBT_VLAN_MASK (EBT_VLAN_ID | EBT_VLAN_PRIO) +#define EBT_VLAN_ENCAP 0x04 +#define EBT_VLAN_MASK (EBT_VLAN_ID | EBT_VLAN_PRIO | EBT_VLAN_ENCAP) #define EBT_VLAN_MATCH "vlan" struct ebt_vlan_info { __u16 id; /* VLAN ID {1-4095} */ - __u16 prio; /* VLAN Priority {0-7} */ + __u8 prio; /* VLAN User Priority {0-7} */ + __u16 encap; /* VLAN Encapsulated frame code {0-65535} */ __u8 bitmask; /* Args bitmask bit 1=1 - ID arg, - bit 2=1 - Pirority arg */ + bit 2=1 User-Priority arg, bit 3=1 encap*/ __u8 invflags; /* Inverse bitmask bit 1=1 - inversed ID arg, bit 2=1 - inversed Pirority arg */ }; -- cgit v1.2.3