* [HEADS UP] rebase nf-next
@ 2014-09-09 14:41 Pablo Neira Ayuso
0 siblings, 0 replies; only message in thread
From: Pablo Neira Ayuso @ 2014-09-09 14:41 UTC (permalink / raw)
To: Netfilter Development Mailing list
Hi,
kbuild reported this:
Note: the nftables/master HEAD
cd07f7cc59a0e7f8bba30166acf2c13c6b0ae2e3 builds fine.
It only hurts bisectibility.
All error/warnings:
>> net/ipv6/netfilter/nft_chain_nat_ipv6.c:31:21: error: conflicting
>> types for 'nf_nat_ipv6_fn'
static unsigned int nf_nat_ipv6_fn(const struct nf_hook_ops *ops,
^
In file included from net/ipv6/netfilter/nft_chain_nat_ipv6.c:24:0:
include/net/netfilter/nf_nat_l3proto.h:115:14: note: previous declaration of 'nf_nat_ipv6_fn' was here
unsigned int nf_nat_ipv6_fn(const struct nf_hook_ops *ops, struct sk_buff *skb,
When generalizing the NAT IPv6 core, I unfortunately clashed with the
existing nf_nat_ipv6_fn in net/ipv6/netfilter/nft_chain_nat_ipv6.c.
I don't want to pass up this problem in the next pull request, so I'm
fixing it here by renaming nf_nat_ipv6_fn to nft_nat_ipv6_fn in
("netfilter: nat: move specific NAT IPv6 to core") and forcing a push.
Sorry for the inconvenience to those that have a working copy of
nf-next. Thanks.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-09 14:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-09 14:41 [HEADS UP] rebase nf-next Pablo Neira Ayuso
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).