Unifies libip[6]t_limit.c into libxt_limit.c.

2 files changed, 6 insertions, 27 deletions

diff --git a/include/linux/netfilter_ipv4/ipt_limit.h b/include/linux/netfilter/xt_limit.h
index f46d4b4..c0aa6d9 100644
--- a/include/linux/netfilter_ipv4/ipt_limit.h
+++ b/include/linux/netfilter/xt_limit.h
@@ -1,21 +1,21 @@
-#ifndef _IPT_RATE_H
-#define _IPT_RATE_H
+#ifndef _XT_RATE_H
+#define _XT_RATE_H
 
 /* timings are in milliseconds. */
-#define IPT_LIMIT_SCALE 10000
+#define XT_LIMIT_SCALE 10000
 
 /* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
    seconds, or one every 59 hours. */
-struct ipt_rateinfo {
+struct xt_rateinfo {
 	u_int32_t avg;    /* Average secs between packets * scale */
 	u_int32_t burst;  /* Period multiplier for upper limit. */
 
 	/* Used internally by the kernel */
 	unsigned long prev;
 	/* Ugly, ugly fucker. */
-	struct ipt_rateinfo *master;
+	struct xt_rateinfo *master;
 
 	u_int32_t credit;
 	u_int32_t credit_cap, cost;
 };
-#endif /*_IPT_RATE_H*/
+#endif /*_XT_RATE_H*/
diff --git a/include/linux/netfilter_ipv6/ip6t_limit.h b/include/linux/netfilter_ipv6/ip6t_limit.h
deleted file mode 100644
index 6e17a67..0000000
--- a/include/linux/netfilter_ipv6/ip6t_limit.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _IP6T_RATE_H
-#define _IP6T_RATE_H
-
-/* timings are in milliseconds. */
-#define IP6T_LIMIT_SCALE 10000
-
-/* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
-   seconds, or one every 59 hours. */
-struct ip6t_rateinfo {
-	u_int32_t avg;    /* Average secs between packets * scale */
-	u_int32_t burst;  /* Period multiplier for upper limit. */
-
-	/* Used internally by the kernel */
-	unsigned long prev;
-	/* Ugly, ugly fucker. */
-	struct ip6t_rateinfo *master;
-
-	u_int32_t credit;
-	u_int32_t credit_cap, cost;
-};
-#endif /*_IPT_RATE_H*/