summaryrefslogtreecommitdiffstats
path: root/kernel/linux/include/linux/netfilter_bridge
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/linux/include/linux/netfilter_bridge')
-rw-r--r--kernel/linux/include/linux/netfilter_bridge/ebtables.h38
1 files changed, 19 insertions, 19 deletions
diff --git a/kernel/linux/include/linux/netfilter_bridge/ebtables.h b/kernel/linux/include/linux/netfilter_bridge/ebtables.h
index 6660af1..aefec05 100644
--- a/kernel/linux/include/linux/netfilter_bridge/ebtables.h
+++ b/kernel/linux/include/linux/netfilter_bridge/ebtables.h
@@ -4,7 +4,7 @@
* Authors:
* Bart De Schuymer <bart.de.schuymer@pandora.be>
*
- * ebtables.c,v 2.0, April, 2002
+ * ebtables.c,v 2.0, September, 2002
*
* This code is stongly inspired on the iptables code which is
* Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling
@@ -20,19 +20,6 @@
#define EBT_CHAIN_MAXNAMELEN EBT_TABLE_MAXNAMELEN
#define EBT_FUNCTION_MAXNAMELEN EBT_TABLE_MAXNAMELEN
-// [gs]etsockopt numbers
-#define EBT_BASE_CTL 128
-
-#define EBT_SO_SET_ENTRIES (EBT_BASE_CTL)
-#define EBT_SO_SET_COUNTERS (EBT_SO_SET_ENTRIES+1)
-#define EBT_SO_SET_MAX (EBT_SO_SET_COUNTERS+1)
-
-#define EBT_SO_GET_INFO (EBT_BASE_CTL)
-#define EBT_SO_GET_ENTRIES (EBT_SO_GET_INFO+1)
-#define EBT_SO_GET_INIT_INFO (EBT_SO_GET_ENTRIES+1)
-#define EBT_SO_GET_INIT_ENTRIES (EBT_SO_GET_INIT_INFO+1)
-#define EBT_SO_GET_MAX (EBT_SO_GET_INIT_ENTRIES+1)
-
// verdicts >0 are "branches"
#define EBT_ACCEPT -1
#define EBT_DROP -2
@@ -40,10 +27,6 @@
#define EBT_RETURN -4
#define NUM_STANDARD_TARGETS 4
-// return values for match() functions
-#define EBT_MATCH 0
-#define EBT_NOMATCH 1
-
struct ebt_counter
{
uint64_t pcnt;
@@ -180,6 +163,23 @@ struct ebt_replace
#ifdef __KERNEL__
+// [gs]etsockopt numbers
+#define EBT_BASE_CTL 128
+
+#define EBT_SO_SET_ENTRIES (EBT_BASE_CTL)
+#define EBT_SO_SET_COUNTERS (EBT_SO_SET_ENTRIES+1)
+#define EBT_SO_SET_MAX (EBT_SO_SET_COUNTERS+1)
+
+#define EBT_SO_GET_INFO (EBT_BASE_CTL)
+#define EBT_SO_GET_ENTRIES (EBT_SO_GET_INFO+1)
+#define EBT_SO_GET_INIT_INFO (EBT_SO_GET_ENTRIES+1)
+#define EBT_SO_GET_INIT_ENTRIES (EBT_SO_GET_INIT_INFO+1)
+#define EBT_SO_GET_MAX (EBT_SO_GET_INIT_ENTRIES+1)
+
+// return values for match() functions
+#define EBT_MATCH 0
+#define EBT_NOMATCH 1
+
struct ebt_match
{
struct list_head list;
@@ -242,7 +242,7 @@ struct ebt_table_info
// room to maintain the stack used for jumping from and into udc
struct ebt_chainstack **chainstack;
char *entries;
- struct ebt_counter counters[0] __attribute__((aligned(SMP_CACHE_BYTES)));
+ struct ebt_counter counters[0] ____cacheline_aligned;
};
struct ebt_table