Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / linux / netfilter_ipv6 / ip6t_physdev.h

diff --git a/include/linux/netfilter_ipv6/ip6t_physdev.h b/include/linux/netfilter_ipv6/ip6t_physdev.h
index c234731..c161c0a 100644 (file)
--- a/include/linux/netfilter_ipv6/ip6t_physdev.h
+++ b/include/linux/netfilter_ipv6/ip6t_physdev.h
@@ -1,24 +1,17 @@
 #ifndef _IP6T_PHYSDEV_H
 #define _IP6T_PHYSDEV_H
 
-#ifdef __KERNEL__
-#include <linux/if.h>
-#endif
+/* Backwards compatibility for old userspace */
 
-#define IP6T_PHYSDEV_OP_IN             0x01
-#define IP6T_PHYSDEV_OP_OUT            0x02
-#define IP6T_PHYSDEV_OP_BRIDGED                0x04
-#define IP6T_PHYSDEV_OP_ISIN           0x08
-#define IP6T_PHYSDEV_OP_ISOUT          0x10
-#define IP6T_PHYSDEV_OP_MASK           (0x20 - 1)
+#include <linux/netfilter/xt_physdev.h>
 
-struct ip6t_physdev_info {
-       char physindev[IFNAMSIZ];
-       char in_mask[IFNAMSIZ];
-       char physoutdev[IFNAMSIZ];
-       char out_mask[IFNAMSIZ];
-       u_int8_t invert;
-       u_int8_t bitmask;
-};
+#define IP6T_PHYSDEV_OP_IN             XT_PHYSDEV_OP_IN
+#define IP6T_PHYSDEV_OP_OUT            XT_PHYSDEV_OP_OUT
+#define IP6T_PHYSDEV_OP_BRIDGED                XT_PHYSDEV_OP_BRIDGED
+#define IP6T_PHYSDEV_OP_ISIN           XT_PHYSDEV_OP_ISIN
+#define IP6T_PHYSDEV_OP_ISOUT          XT_PHYSDEV_OP_ISOUT
+#define IP6T_PHYSDEV_OP_MASK           XT_PHYSDEV_OP_MASK
+
+#define ip6t_physdev_info xt_physdev_info
 
 #endif /*_IP6T_PHYSDEV_H*/