diff options
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 6 | ||||
| -rw-r--r-- | net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c index 4b7be4bb4d03..6f19c4a49560 100644 --- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | |||
| @@ -353,8 +353,7 @@ static ctl_table nf_ct_ipv6_sysctl_table[] = { | |||
| 353 | }; | 353 | }; |
| 354 | #endif | 354 | #endif |
| 355 | 355 | ||
| 356 | #if defined(CONFIG_NF_CT_NETLINK) || \ | 356 | #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) |
| 357 | defined(CONFIG_NF_CT_NETLINK_MODULE) | ||
| 358 | 357 | ||
| 359 | #include <linux/netfilter/nfnetlink.h> | 358 | #include <linux/netfilter/nfnetlink.h> |
| 360 | #include <linux/netfilter/nfnetlink_conntrack.h> | 359 | #include <linux/netfilter/nfnetlink_conntrack.h> |
| @@ -403,8 +402,7 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6 = { | |||
| 403 | .print_tuple = ipv6_print_tuple, | 402 | .print_tuple = ipv6_print_tuple, |
| 404 | .print_conntrack = ipv6_print_conntrack, | 403 | .print_conntrack = ipv6_print_conntrack, |
| 405 | .prepare = ipv6_prepare, | 404 | .prepare = ipv6_prepare, |
| 406 | #if defined(CONFIG_NF_CT_NETLINK) || \ | 405 | #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) |
| 407 | defined(CONFIG_NF_CT_NETLINK_MODULE) | ||
| 408 | .tuple_to_nfattr = ipv6_tuple_to_nfattr, | 406 | .tuple_to_nfattr = ipv6_tuple_to_nfattr, |
| 409 | .nfattr_to_tuple = ipv6_nfattr_to_tuple, | 407 | .nfattr_to_tuple = ipv6_nfattr_to_tuple, |
| 410 | #endif | 408 | #endif |
diff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c index 21f19cc719f3..075da4f287b8 100644 --- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c +++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | |||
| @@ -244,8 +244,7 @@ icmpv6_error(struct sk_buff *skb, unsigned int dataoff, | |||
| 244 | return icmpv6_error_message(skb, dataoff, ctinfo, hooknum); | 244 | return icmpv6_error_message(skb, dataoff, ctinfo, hooknum); |
| 245 | } | 245 | } |
| 246 | 246 | ||
| 247 | #if defined(CONFIG_NF_CT_NETLINK) || \ | 247 | #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) |
| 248 | defined(CONFIG_NF_CT_NETLINK_MODULE) | ||
| 249 | 248 | ||
| 250 | #include <linux/netfilter/nfnetlink.h> | 249 | #include <linux/netfilter/nfnetlink.h> |
| 251 | #include <linux/netfilter/nfnetlink_conntrack.h> | 250 | #include <linux/netfilter/nfnetlink_conntrack.h> |
| @@ -327,8 +326,7 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 = | |||
| 327 | .packet = icmpv6_packet, | 326 | .packet = icmpv6_packet, |
| 328 | .new = icmpv6_new, | 327 | .new = icmpv6_new, |
| 329 | .error = icmpv6_error, | 328 | .error = icmpv6_error, |
| 330 | #if defined(CONFIG_NF_CT_NETLINK) || \ | 329 | #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) |
| 331 | defined(CONFIG_NF_CT_NETLINK_MODULE) | ||
| 332 | .tuple_to_nfattr = icmpv6_tuple_to_nfattr, | 330 | .tuple_to_nfattr = icmpv6_tuple_to_nfattr, |
| 333 | .nfattr_to_tuple = icmpv6_nfattr_to_tuple, | 331 | .nfattr_to_tuple = icmpv6_nfattr_to_tuple, |
| 334 | #endif | 332 | #endif |