netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: ffmancera@riseup.net
Subject: [PATCH nf-next] netfilter: ipv6: fix CONFIG_SYN_COOKIES=n
Date: Tue, 18 Jun 2019 10:53:43 +0200	[thread overview]
Message-ID: <20190618085343.8761-1-pablo@netfilter.org> (raw)

With CONFIG_SYN_COOKIES=n:

   In file included from net/ipv6/ip6_output.c:44:0:
   include/linux/netfilter_ipv6.h: In function 'nf_ipv6_cookie_init_sequence':
>> include/linux/netfilter_ipv6.h:174:9: error: implicit declaration of function '__cookie_v6_init_sequence'; did you mean 'cookie_init_sequence'? [-Werror=implicit-function-declaration]
     return __cookie_v6_init_sequence(iph, th, mssp);
            ^~~~~~~~~~~~~~~~~~~~~~~~~
            cookie_init_sequence
   include/linux/netfilter_ipv6.h: In function 'nf_cookie_v6_check':
>> include/linux/netfilter_ipv6.h:189:9: error: implicit declaration of function '__cookie_v6_check'; did you mean '__cookie_v4_check'? [-Werror=implicit-function-declaration]
     return __cookie_v6_check(iph, th, cookie);
            ^~~~~~~~~~~~~~~~~
            __cookie_v4_check

Fixes: 3006a5224f15 ("netfilter: synproxy: remove module dependency on IPv6 SYNPROXY")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 net/ipv6/netfilter.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c
index dffb10fdc3e8..f80188b749c0 100644
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -234,6 +234,8 @@ static const struct nf_ipv6_ops ipv6ops = {
 	.route_me_harder	= ip6_route_me_harder,
 	.dev_get_saddr		= ipv6_dev_get_saddr,
 	.route			= __nf_ip6_route,
+#endif
+#if IS_MODULE(CONFIG_IPV6) && defined(CONFIG_SYN_COOKIES)
 	.cookie_init_sequence	= __cookie_v6_init_sequence,
 	.cookie_v6_check	= __cookie_v6_check,
 #endif
-- 
2.11.0


                 reply	other threads:[~2019-06-18  8:53 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190618085343.8761-1-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=ffmancera@riseup.net \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).