summaryrefslogtreecommitdiffstats
path: root/kernel/linux/include/linux/netfilter_bridge
diff options
context:
space:
mode:
authorfnm3 <fnm3>2002-06-14 17:28:13 +0000
committerfnm3 <fnm3>2002-06-14 17:28:13 +0000
commit199d31a20f95babd74d692beb89988e2fb851032 (patch)
treef830ecf66793450012d4783b92158ec557d86c6c /kernel/linux/include/linux/netfilter_bridge
parent0d581985af2e3dfea67bbf4825628f642a7ae134 (diff)
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
Diffstat (limited to 'kernel/linux/include/linux/netfilter_bridge')
-rw-r--r--kernel/linux/include/linux/netfilter_bridge/ebt_vlan.h8
1 files changed, 5 insertions, 3 deletions
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 */
};