1 files changed, 8 insertions, 34 deletions
diff --git a/include/linux/netfilter_ipv4/ipt_hashlimit.h b/include/linux/netfilter_ipv4/ipt_hashlimit.h
index ac2cb64ecd7..5662120a3d7 100644
--- a/include/linux/netfilter_ipv4/ipt_hashlimit.h
+++ b/include/linux/netfilter_ipv4/ipt_hashlimit.h
@@ -1,40 +1,14 @@
 #ifndef _IPT_HASHLIMIT_H
 #define _IPT_HASHLIMIT_H
-/* timings are in milliseconds. */
+#include <linux/netfilter/xt_hashlimit.h>
-#define IPT_HASHLIMIT_SCALE 10000
-/* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
-   seconds, or one every 59 hours. */
-/* details of this structure hidden by the implementation */
+#define IPT_HASHLIMIT_SCALE     XT_HASHLIMIT_SCALE
-struct ipt_hashlimit_htable;
+#define IPT_HASHLIMIT_HASH_DIP  XT_HASHLIMIT_HASH_DIP
+#define IPT_HASHLIMIT_HASH_DPT  XT_HASHLIMIT_HASH_DPT
+#define IPT_HASHLIMIT_HASH_SIP  XT_HASHLIMIT_HASH_SIP
+#define IPT_HASHLIMIT_HASH_SPT  XT_HASHLIMIT_HASH_SPT
-#define IPT_HASHLIMIT_HASH_DIP  0x0001
+#define ipt_hashlimit_info xt_hashlimit_info
-#define IPT_HASHLIMIT_HASH_DPT  0x0002
-#define IPT_HASHLIMIT_HASH_SIP  0x0004
-#define IPT_HASHLIMIT_HASH_SPT  0x0008
-struct hashlimit_cfg {
+#endif /* _IPT_HASHLIMIT_H */
-        u_int32_t mode;   /* bitmask of IPT_HASHLIMIT_HASH_* */
-        u_int32_t avg;    /* Average secs between packets * scale */
-        u_int32_t burst;  /* Period multiplier for upper limit. */
-        /* user specified */
-        u_int32_t size;         /* how many buckets */
-        u_int32_t max;          /* max number of entries */
-        u_int32_t gc_interval;  /* gc interval */
-        u_int32_t expire;       /* when do entries expire? */
-};
-struct ipt_hashlimit_info {
-        char name [IFNAMSIZ];           /* name */
-        struct hashlimit_cfg cfg;
-        struct ipt_hashlimit_htable *hinfo;
-        /* Used internally by the kernel */
-        union {
-                void *ptr;
-                struct ipt_hashlimit_info *master;
-        } u;
-};
-#endif /*_IPT_HASHLIMIT_H*/

diff --git a/include/linux/netfilter_ipv4/ipt_hashlimit.h b/include/linux/netfilter_ipv4/ipt_hashlimit.h index ac2cb64ecd7..5662120a3d7 100644 --- a/include/linux/netfilter_ipv4/ipt_hashlimit.h +++ b/include/linux/netfilter_ipv4/ipt_hashlimit.h
@@ -1,40 +1,14 @@
1	#ifndef _IPT_HASHLIMIT_H	1	#ifndef _IPT_HASHLIMIT_H
2	#define _IPT_HASHLIMIT_H	2	#define _IPT_HASHLIMIT_H
3		3
4	/* timings are in milliseconds. */	4	#include <linux/netfilter/xt_hashlimit.h>
5	#define IPT_HASHLIMIT_SCALE 10000
6	/* 1/10,000 sec period => max of 10,000/sec. Min rate is then 429490
7	seconds, or one every 59 hours. */
8		5
9	/* details of this structure hidden by the implementation */	6	#define IPT_HASHLIMIT_SCALE XT_HASHLIMIT_SCALE
10	struct ipt_hashlimit_htable;	7	#define IPT_HASHLIMIT_HASH_DIP XT_HASHLIMIT_HASH_DIP
		8	#define IPT_HASHLIMIT_HASH_DPT XT_HASHLIMIT_HASH_DPT
		9	#define IPT_HASHLIMIT_HASH_SIP XT_HASHLIMIT_HASH_SIP
		10	#define IPT_HASHLIMIT_HASH_SPT XT_HASHLIMIT_HASH_SPT
11		11
12	#define IPT_HASHLIMIT_HASH_DIP 0x0001	12	#define ipt_hashlimit_info xt_hashlimit_info
13	#define IPT_HASHLIMIT_HASH_DPT 0x0002
14	#define IPT_HASHLIMIT_HASH_SIP 0x0004
15	#define IPT_HASHLIMIT_HASH_SPT 0x0008
16		13
17	struct hashlimit_cfg {	14	#endif /* _IPT_HASHLIMIT_H */
18	u_int32_t mode; /* bitmask of IPT_HASHLIMIT_HASH_* */
19	u_int32_t avg; /* Average secs between packets * scale */
20	u_int32_t burst; /* Period multiplier for upper limit. */
21
22	/* user specified */
23	u_int32_t size; /* how many buckets */
24	u_int32_t max; /* max number of entries */
25	u_int32_t gc_interval; /* gc interval */
26	u_int32_t expire; /* when do entries expire? */
27	};
28
29	struct ipt_hashlimit_info {
30	char name [IFNAMSIZ]; /* name */
31	struct hashlimit_cfg cfg;
32	struct ipt_hashlimit_htable *hinfo;
33
34	/* Used internally by the kernel */
35	union {
36	void *ptr;
37	struct ipt_hashlimit_info *master;
38	} u;
39	};
40	#endif /_IPT_HASHLIMIT_H/