aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@computergmbh.de>2008-01-15 02:33:14 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:02:19 -0500
commit8b6f3f62fea7b85fce8f7d12aabba7b191bf60d2 (patch)
tree07a89e4f9143c2fcbf2842878b4f4375e41fc3c0 /include
parentcdfe8b9797f1a47fe24a9bf9e98a351bae11ab99 (diff)
[NETFILTER]: Annotate start of kernel fields in NF headers
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/netfilter/xt_RATEEST.h2
-rw-r--r--include/linux/netfilter/xt_connlimit.h2
-rw-r--r--include/linux/netfilter/xt_hashlimit.h2
-rw-r--r--include/linux/netfilter/xt_quota.h2
-rw-r--r--include/linux/netfilter/xt_rateest.h2
-rw-r--r--include/linux/netfilter/xt_statistic.h1
-rw-r--r--include/linux/netfilter/xt_string.h2
-rw-r--r--include/linux/netfilter_ipv4/ipt_CLUSTERIP.h1
8 files changed, 12 insertions, 2 deletions
diff --git a/include/linux/netfilter/xt_RATEEST.h b/include/linux/netfilter/xt_RATEEST.h
index 670f2e49d4f..f79e3133cbe 100644
--- a/include/linux/netfilter/xt_RATEEST.h
+++ b/include/linux/netfilter/xt_RATEEST.h
@@ -5,6 +5,8 @@ struct xt_rateest_target_info {
5 char name[IFNAMSIZ]; 5 char name[IFNAMSIZ];
6 int8_t interval; 6 int8_t interval;
7 u_int8_t ewma_log; 7 u_int8_t ewma_log;
8
9 /* Used internally by the kernel */
8 struct xt_rateest *est __attribute__((aligned(8))); 10 struct xt_rateest *est __attribute__((aligned(8)));
9}; 11};
10 12
diff --git a/include/linux/netfilter/xt_connlimit.h b/include/linux/netfilter/xt_connlimit.h
index 315d2dce9da..7e3284bcbd2 100644
--- a/include/linux/netfilter/xt_connlimit.h
+++ b/include/linux/netfilter/xt_connlimit.h
@@ -15,7 +15,7 @@ struct xt_connlimit_info {
15 }; 15 };
16 unsigned int limit, inverse; 16 unsigned int limit, inverse;
17 17
18 /* this needs to be at the end */ 18 /* Used internally by the kernel */
19 struct xt_connlimit_data *data __attribute__((aligned(8))); 19 struct xt_connlimit_data *data __attribute__((aligned(8)));
20}; 20};
21 21
diff --git a/include/linux/netfilter/xt_hashlimit.h b/include/linux/netfilter/xt_hashlimit.h
index b4556b8edbf..c19972e4564 100644
--- a/include/linux/netfilter/xt_hashlimit.h
+++ b/include/linux/netfilter/xt_hashlimit.h
@@ -29,9 +29,9 @@ struct hashlimit_cfg {
29struct xt_hashlimit_info { 29struct xt_hashlimit_info {
30 char name [IFNAMSIZ]; /* name */ 30 char name [IFNAMSIZ]; /* name */
31 struct hashlimit_cfg cfg; 31 struct hashlimit_cfg cfg;
32 struct xt_hashlimit_htable *hinfo;
33 32
34 /* Used internally by the kernel */ 33 /* Used internally by the kernel */
34 struct xt_hashlimit_htable *hinfo;
35 union { 35 union {
36 void *ptr; 36 void *ptr;
37 struct xt_hashlimit_info *master; 37 struct xt_hashlimit_info *master;
diff --git a/include/linux/netfilter/xt_quota.h b/include/linux/netfilter/xt_quota.h
index acd7fd77bbe..4c8368d781e 100644
--- a/include/linux/netfilter/xt_quota.h
+++ b/include/linux/netfilter/xt_quota.h
@@ -9,6 +9,8 @@ enum xt_quota_flags {
9struct xt_quota_info { 9struct xt_quota_info {
10 u_int32_t flags; 10 u_int32_t flags;
11 u_int32_t pad; 11 u_int32_t pad;
12
13 /* Used internally by the kernel */
12 aligned_u64 quota; 14 aligned_u64 quota;
13 struct xt_quota_info *master; 15 struct xt_quota_info *master;
14}; 16};
diff --git a/include/linux/netfilter/xt_rateest.h b/include/linux/netfilter/xt_rateest.h
index 51948e15aea..2010cb74250 100644
--- a/include/linux/netfilter/xt_rateest.h
+++ b/include/linux/netfilter/xt_rateest.h
@@ -26,6 +26,8 @@ struct xt_rateest_match_info {
26 u_int32_t pps1; 26 u_int32_t pps1;
27 u_int32_t bps2; 27 u_int32_t bps2;
28 u_int32_t pps2; 28 u_int32_t pps2;
29
30 /* Used internally by the kernel */
29 struct xt_rateest *est1 __attribute__((aligned(8))); 31 struct xt_rateest *est1 __attribute__((aligned(8)));
30 struct xt_rateest *est2 __attribute__((aligned(8))); 32 struct xt_rateest *est2 __attribute__((aligned(8)));
31}; 33};
diff --git a/include/linux/netfilter/xt_statistic.h b/include/linux/netfilter/xt_statistic.h
index c344e9916e2..3d38bc97504 100644
--- a/include/linux/netfilter/xt_statistic.h
+++ b/include/linux/netfilter/xt_statistic.h
@@ -23,6 +23,7 @@ struct xt_statistic_info {
23 struct { 23 struct {
24 u_int32_t every; 24 u_int32_t every;
25 u_int32_t packet; 25 u_int32_t packet;
26 /* Used internally by the kernel */
26 u_int32_t count; 27 u_int32_t count;
27 } nth; 28 } nth;
28 } u; 29 } u;
diff --git a/include/linux/netfilter/xt_string.h b/include/linux/netfilter/xt_string.h
index 3b3419f2637..bb21dd1aee2 100644
--- a/include/linux/netfilter/xt_string.h
+++ b/include/linux/netfilter/xt_string.h
@@ -12,6 +12,8 @@ struct xt_string_info
12 char pattern[XT_STRING_MAX_PATTERN_SIZE]; 12 char pattern[XT_STRING_MAX_PATTERN_SIZE];
13 u_int8_t patlen; 13 u_int8_t patlen;
14 u_int8_t invert; 14 u_int8_t invert;
15
16 /* Used internally by the kernel */
15 struct ts_config __attribute__((aligned(8))) *config; 17 struct ts_config __attribute__((aligned(8))) *config;
16}; 18};
17 19
diff --git a/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h b/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
index daf50be22c9..e5a3687c8a7 100644
--- a/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
+++ b/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
@@ -27,6 +27,7 @@ struct ipt_clusterip_tgt_info {
27 u_int32_t hash_mode; 27 u_int32_t hash_mode;
28 u_int32_t hash_initval; 28 u_int32_t hash_initval;
29 29
30 /* Used internally by the kernel */
30 struct clusterip_config *config; 31 struct clusterip_config *config;
31}; 32};
32 33