From: Jeremy Sowden <jeremy@azazel.net>
To: Adam Borowski <kilobyte@angband.pl>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>,
Jozsef Kadlecsik <kadlec@netfilter.org>,
Florian Westphal <fw@strlen.de>,
Roopa Prabhu <roopa@cumulusnetworks.com>,
Nikolay Aleksandrov <nikolay@cumulusnetworks.com>,
netfilter-devel@vger.kernel.org, coreteam@netfilter.org,
netdev@vger.kernel.org
Subject: Re: [PATCH] netfilter: bridge: drop a broken include
Date: Mon, 16 Sep 2019 14:08:12 +0100 [thread overview]
Message-ID: <20190916130811.GA29776@azazel.net> (raw)
In-Reply-To: <20190916000517.45028-1-kilobyte@angband.pl>
[-- Attachment #1: Type: text/plain, Size: 4755 bytes --]
On 2019-09-16, at 02:05:16 +0200, Adam Borowski wrote:
> This caused a build failure if CONFIG_NF_CONNTRACK_BRIDGE is set but
> CONFIG_NF_TABLES=n -- and appears to be unused anyway.
>
> Signed-off-by: Adam Borowski <kilobyte@angband.pl>
> ---
> net/bridge/netfilter/nf_conntrack_bridge.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/net/bridge/netfilter/nf_conntrack_bridge.c
> b/net/bridge/netfilter/nf_conntrack_bridge.c
> index 4f5444d2a526..844ef5a53f87 100644
> --- a/net/bridge/netfilter/nf_conntrack_bridge.c
> +++ b/net/bridge/netfilter/nf_conntrack_bridge.c
> @@ -18,7 +18,6 @@
>
> #include <linux/netfilter/nf_tables.h>
> #include <net/netfilter/ipv6/nf_defrag_ipv6.h>
> -#include <net/netfilter/nf_tables.h>
>
> #include "../br_private.h"
>
> --
> 2.23.0
This is the build-failure (reproduced with v5.3):
In file included from net/bridge/netfilter/nf_conntrack_bridge.c:21:
./include/net/netfilter/nf_tables.h: In function ‘nft_gencursor_next’:
./include/net/netfilter/nf_tables.h:1223:14: error: ‘const struct net’ has no member named ‘nft’; did you mean ‘nf’?
1223 | return net->nft.gencursor + 1 == 1 ? 1 : 0;
| ^~~
| nf
In file included from ./include/linux/export.h:45,
from ./include/linux/linkage.h:7,
from ./include/linux/kernel.h:8,
from ./include/linux/skbuff.h:13,
from ./include/linux/ip.h:16,
from net/bridge/netfilter/nf_conntrack_bridge.c:3:
./include/net/netfilter/nf_tables.h: In function ‘nft_genmask_cur’:
./include/net/netfilter/nf_tables.h:1234:29: error: ‘const struct net’ has no member named ‘nft’; did you mean ‘nf’?
1234 | return 1 << READ_ONCE(net->nft.gencursor);
| ^~~
./include/linux/compiler.h:261:17: note: in definition of macro ‘__READ_ONCE’
261 | union { typeof(x) __val; char __c[1]; } __u; \
| ^
./include/net/netfilter/nf_tables.h:1234:14: note: in expansion of macro ‘READ_ONCE’
1234 | return 1 << READ_ONCE(net->nft.gencursor);
| ^~~~~~~~~
./include/net/netfilter/nf_tables.h:1234:29: error: ‘const struct net’ has no member named ‘nft’; did you mean ‘nf’?
1234 | return 1 << READ_ONCE(net->nft.gencursor);
| ^~~
./include/linux/compiler.h:263:22: note: in definition of macro ‘__READ_ONCE’
263 | __read_once_size(&(x), __u.__c, sizeof(x)); \
| ^
./include/net/netfilter/nf_tables.h:1234:14: note: in expansion of macro ‘READ_ONCE’
1234 | return 1 << READ_ONCE(net->nft.gencursor);
| ^~~~~~~~~
./include/net/netfilter/nf_tables.h:1234:29: error: ‘const struct net’ has no member named ‘nft’; did you mean ‘nf’?
1234 | return 1 << READ_ONCE(net->nft.gencursor);
| ^~~
./include/linux/compiler.h:263:42: note: in definition of macro ‘__READ_ONCE’
263 | __read_once_size(&(x), __u.__c, sizeof(x)); \
| ^
./include/net/netfilter/nf_tables.h:1234:14: note: in expansion of macro ‘READ_ONCE’
1234 | return 1 << READ_ONCE(net->nft.gencursor);
| ^~~~~~~~~
./include/net/netfilter/nf_tables.h:1234:29: error: ‘const struct net’ has no member named ‘nft’; did you mean ‘nf’?
1234 | return 1 << READ_ONCE(net->nft.gencursor);
| ^~~
./include/linux/compiler.h:265:30: note: in definition of macro ‘__READ_ONCE’
265 | __read_once_size_nocheck(&(x), __u.__c, sizeof(x)); \
| ^
./include/net/netfilter/nf_tables.h:1234:14: note: in expansion of macro ‘READ_ONCE’
1234 | return 1 << READ_ONCE(net->nft.gencursor);
| ^~~~~~~~~
./include/net/netfilter/nf_tables.h:1234:29: error: ‘const struct net’ has no member named ‘nft’; did you mean ‘nf’?
1234 | return 1 << READ_ONCE(net->nft.gencursor);
| ^~~
./include/linux/compiler.h:265:50: note: in definition of macro ‘__READ_ONCE’
265 | __read_once_size_nocheck(&(x), __u.__c, sizeof(x)); \
| ^
./include/net/netfilter/nf_tables.h:1234:14: note: in expansion of macro ‘READ_ONCE’
1234 | return 1 << READ_ONCE(net->nft.gencursor);
| ^~~~~~~~~
There are already changes in the net-next tree that will fix it.
J.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-09-16 13:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-16 0:05 [PATCH] netfilter: bridge: drop a broken include Adam Borowski
2019-09-16 13:08 ` Jeremy Sowden [this message]
2019-09-17 5:09 ` Pablo Neira Ayuso
2019-09-17 8:08 ` Jeremy Sowden
2019-09-17 14:59 ` Jeremy Sowden
2019-09-20 9:49 ` Pablo Neira Ayuso
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=20190916130811.GA29776@azazel.net \
--to=jeremy@azazel.net \
--cc=coreteam@netfilter.org \
--cc=fw@strlen.de \
--cc=kadlec@netfilter.org \
--cc=kilobyte@angband.pl \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=nikolay@cumulusnetworks.com \
--cc=pablo@netfilter.org \
--cc=roopa@cumulusnetworks.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.