Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / include / linux / netfilter_ipv4 / ipt_dccp.h

diff --git a/include/linux/netfilter_ipv4/ipt_dccp.h b/include/linux/netfilter_ipv4/ipt_dccp.h
index 3cb3a52..e70d11e 100644 (file)
--- a/include/linux/netfilter_ipv4/ipt_dccp.h
+++ b/include/linux/netfilter_ipv4/ipt_dccp.h
@@ -1,23 +1,15 @@
 #ifndef _IPT_DCCP_H_
 #define _IPT_DCCP_H_
 
-#define IPT_DCCP_SRC_PORTS             0x01
-#define IPT_DCCP_DEST_PORTS            0x02
-#define IPT_DCCP_TYPE                  0x04
-#define IPT_DCCP_OPTION                        0x08
+#include <linux/netfilter/xt_dccp.h>
+#define IPT_DCCP_SRC_PORTS     XT_DCCP_SRC_PORTS
+#define IPT_DCCP_DEST_PORTS    XT_DCCP_DEST_PORTS
+#define IPT_DCCP_TYPE          XT_DCCP_TYPE
+#define IPT_DCCP_OPTION                XT_DCCP_OPTION
 
-#define IPT_DCCP_VALID_FLAGS           0x0f
+#define IPT_DCCP_VALID_FLAGS   XT_DCCP_VALID_FLAGS
 
-struct ipt_dccp_info {
-       u_int16_t dpts[2];  /* Min, Max */
-       u_int16_t spts[2];  /* Min, Max */
-
-       u_int16_t flags;
-       u_int16_t invflags;
-
-       u_int16_t typemask;
-       u_int8_t option;
-};
+#define ipt_dccp_info xt_dccp_info
 
 #endif /* _IPT_DCCP_H_ */