Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6-omap-h63xx.git] / include / linux / netfilter_ipv4 / ipt_connbytes.h

diff --git a/include/linux/netfilter_ipv4/ipt_connbytes.h b/include/linux/netfilter_ipv4/ipt_connbytes.h
index 9e5532f8d8ac8c3595d33089e08dc6d18438a393..f63e6ee911130b9b30204980459ccddd2d005279 100644 (file)
--- a/include/linux/netfilter_ipv4/ipt_connbytes.h
+++ b/include/linux/netfilter_ipv4/ipt_connbytes.h
@@ -1,25 +1,18 @@
 #ifndef _IPT_CONNBYTES_H
 #define _IPT_CONNBYTES_H
 
-enum ipt_connbytes_what {
-       IPT_CONNBYTES_PKTS,
-       IPT_CONNBYTES_BYTES,
-       IPT_CONNBYTES_AVGPKT,
-};
+#include <linux/netfilter/xt_connbytes.h>
+#define ipt_connbytes_what xt_connbytes_what
 
-enum ipt_connbytes_direction {
-       IPT_CONNBYTES_DIR_ORIGINAL,
-       IPT_CONNBYTES_DIR_REPLY,
-       IPT_CONNBYTES_DIR_BOTH,
-};
+#define IPT_CONNBYTES_PKTS     XT_CONNBYTES_PKTS
+#define IPT_CONNBYTES_BYTES    XT_CONNBYTES_BYTES
+#define IPT_CONNBYTES_AVGPKT   XT_CONNBYTES_AVGPKT
+
+#define ipt_connbytes_direction        xt_connbytes_direction
+#define IPT_CONNBYTES_DIR_ORIGINAL     XT_CONNBYTES_DIR_ORIGINAL
+#define IPT_CONNBYTES_DIR_REPLY        XT_CONNBYTES_DIR_REPLY
+#define IPT_CONNBYTES_DIR_BOTH         XT_CONNBYTES_DIR_BOTH
+
+#define ipt_connbytes_info xt_connbytes_info
 
-struct ipt_connbytes_info
-{
-       struct {
-               aligned_u64 from;       /* count to be matched */
-               aligned_u64 to;         /* count to be matched */
-       } count;
-       u_int8_t what;          /* ipt_connbytes_what */
-       u_int8_t direction;     /* ipt_connbytes_direction */
-};
 #endif