[PATCH] Fix sysfs build breakage if !CONFIG_SYSFS

[linux-2.6-omap-h63xx.git] / include / linux / netfilter / nfnetlink_conntrack.h

diff --git a/include/linux/netfilter/nfnetlink_conntrack.h b/include/linux/netfilter/nfnetlink_conntrack.h
index 116fcaced909f3ed78c87688c2065ce23640bcd8..b5883ccee2957b26df1757af390b541ca01a1c3d 100644 (file)
--- a/include/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/linux/netfilter/nfnetlink_conntrack.h
@@ -27,13 +27,15 @@ enum ctattr_type {
        CTA_STATUS,
        CTA_PROTOINFO,
        CTA_HELP,
-       CTA_NAT,
+       CTA_NAT_SRC,
+#define CTA_NAT        CTA_NAT_SRC     /* backwards compatibility */
        CTA_TIMEOUT,
        CTA_MARK,
        CTA_COUNTERS_ORIG,
        CTA_COUNTERS_REPLY,
        CTA_USE,
        CTA_ID,
+       CTA_NAT_DST,
        __CTA_MAX
 };
 #define CTA_MAX (__CTA_MAX - 1)
@@ -64,6 +66,9 @@ enum ctattr_l4proto {
        CTA_PROTO_ICMP_ID,
        CTA_PROTO_ICMP_TYPE,
        CTA_PROTO_ICMP_CODE,
+       CTA_PROTO_ICMPV6_ID,
+       CTA_PROTO_ICMPV6_TYPE,
+       CTA_PROTO_ICMPV6_CODE,
        __CTA_PROTO_MAX
 };
 #define CTA_PROTO_MAX (__CTA_PROTO_MAX - 1)
@@ -128,6 +133,4 @@ enum ctattr_help {
 };
 #define CTA_HELP_MAX (__CTA_HELP_MAX - 1)
 
-#define CTA_HELP_MAXNAMESIZE   32
-
 #endif /* _IPCONNTRACK_NETLINK_H */