* [PATCH] netfilter: Allow xt_nat.c and x_tables.c to compiled in
@ 2012-09-14 2:32 Eric W. Biederman
2012-09-14 3:33 ` Cong Wang
2012-09-14 11:54 ` Patrick McHardy
0 siblings, 2 replies; 6+ messages in thread
From: Eric W. Biederman @ 2012-09-14 2:32 UTC (permalink / raw)
To: David Miller; +Cc: netdev, netfilter-devel, Patrick McHardy
xt_init in x_tables.c must be called before xt_nat_init in xt_nat.c
Reorder the makefile so that x_tables.o comes before xt_nat.o in
netfilter.o.
This allows me to built a kernel with both of these modules compiled in.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---
net/netfilter/Makefile | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
index 98244d4..1f652b6 100644
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -43,6 +43,9 @@ obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
+# generic X tables
+obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
+
nf_nat-y := nf_nat_core.o nf_nat_proto_unknown.o nf_nat_proto_common.o \
nf_nat_proto_udp.o nf_nat_proto_tcp.o nf_nat_helper.o
@@ -64,9 +67,6 @@ obj-$(CONFIG_NF_NAT_TFTP) += nf_nat_tftp.o
# transparent proxy support
obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
-# generic X tables
-obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
-
# combos
obj-$(CONFIG_NETFILTER_XT_MARK) += xt_mark.o
obj-$(CONFIG_NETFILTER_XT_CONNMARK) += xt_connmark.o
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] netfilter: Allow xt_nat.c and x_tables.c to compiled in
2012-09-14 2:32 [PATCH] netfilter: Allow xt_nat.c and x_tables.c to compiled in Eric W. Biederman
@ 2012-09-14 3:33 ` Cong Wang
2012-09-14 11:54 ` Patrick McHardy
1 sibling, 0 replies; 6+ messages in thread
From: Cong Wang @ 2012-09-14 3:33 UTC (permalink / raw)
To: netfilter-devel; +Cc: netdev
On Fri, 14 Sep 2012 at 02:32 GMT, Eric W. Biederman <ebiederm@xmission.com> wrote:
>
> xt_init in x_tables.c must be called before xt_nat_init in xt_nat.c
> Reorder the makefile so that x_tables.o comes before xt_nat.o in
> netfilter.o.
>
> This allows me to built a kernel with both of these modules compiled in.
>
There is a patch to fix the same issue:
http://1984.lsi.us.es/git/nf-next/commit/?id=00545bec9412d130c77f72a08d6c8b6ad21d4a1
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] netfilter: Allow xt_nat.c and x_tables.c to compiled in
2012-09-14 2:32 [PATCH] netfilter: Allow xt_nat.c and x_tables.c to compiled in Eric W. Biederman
2012-09-14 3:33 ` Cong Wang
@ 2012-09-14 11:54 ` Patrick McHardy
2012-09-14 12:08 ` Pablo Neira Ayuso
1 sibling, 1 reply; 6+ messages in thread
From: Patrick McHardy @ 2012-09-14 11:54 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: David Miller, netdev, netfilter-devel
On Thu, 13 Sep 2012, Eric W. Biederman wrote:
> xt_init in x_tables.c must be called before xt_nat_init in xt_nat.c
> Reorder the makefile so that x_tables.o comes before xt_nat.o in
> netfilter.o.
>
> This allows me to built a kernel with both of these modules compiled in.
Thanks, we've already fixed that, the patch is queued in Pablo's tree.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] netfilter: Allow xt_nat.c and x_tables.c to compiled in
2012-09-14 11:54 ` Patrick McHardy
@ 2012-09-14 12:08 ` Pablo Neira Ayuso
2012-09-14 12:25 ` Eric Dumazet
0 siblings, 1 reply; 6+ messages in thread
From: Pablo Neira Ayuso @ 2012-09-14 12:08 UTC (permalink / raw)
To: Patrick McHardy; +Cc: Eric W. Biederman, David Miller, netdev, netfilter-devel
On Fri, Sep 14, 2012 at 01:54:22PM +0200, Patrick McHardy wrote:
> On Thu, 13 Sep 2012, Eric W. Biederman wrote:
>
> >xt_init in x_tables.c must be called before xt_nat_init in xt_nat.c
> >Reorder the makefile so that x_tables.o comes before xt_nat.o in
> >netfilter.o.
> >
> >This allows me to built a kernel with both of these modules compiled in.
>
> Thanks, we've already fixed that, the patch is queued in Pablo's tree.
It should hit Linus tree soon, David pulled the fix yesterday.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] netfilter: Allow xt_nat.c and x_tables.c to compiled in
2012-09-14 12:08 ` Pablo Neira Ayuso
@ 2012-09-14 12:25 ` Eric Dumazet
2012-09-14 12:46 ` Pablo Neira Ayuso
0 siblings, 1 reply; 6+ messages in thread
From: Eric Dumazet @ 2012-09-14 12:25 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: Patrick McHardy, Eric W. Biederman, David Miller, netdev,
netfilter-devel
On Fri, 2012-09-14 at 14:08 +0200, Pablo Neira Ayuso wrote:
> On Fri, Sep 14, 2012 at 01:54:22PM +0200, Patrick McHardy wrote:
> > On Thu, 13 Sep 2012, Eric W. Biederman wrote:
> >
> > >xt_init in x_tables.c must be called before xt_nat_init in xt_nat.c
> > >Reorder the makefile so that x_tables.o comes before xt_nat.o in
> > >netfilter.o.
> > >
> > >This allows me to built a kernel with both of these modules compiled in.
> >
> > Thanks, we've already fixed that, the patch is queued in Pablo's tree.
>
> It should hit Linus tree soon, David pulled the fix yesterday.
> --
Little correction :
Its in net-next, Linus tree doesnt need this fix yet.
http://git.kernel.org/?p=linux/kernel/git/davem/net-next.git;a=commitdiff;h=00545bec9412d130c77f72a08d6c8b6ad21d4a1e
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] netfilter: Allow xt_nat.c and x_tables.c to compiled in
2012-09-14 12:25 ` Eric Dumazet
@ 2012-09-14 12:46 ` Pablo Neira Ayuso
0 siblings, 0 replies; 6+ messages in thread
From: Pablo Neira Ayuso @ 2012-09-14 12:46 UTC (permalink / raw)
To: Eric Dumazet
Cc: Patrick McHardy, Eric W. Biederman, David Miller, netdev,
netfilter-devel
On Fri, Sep 14, 2012 at 02:25:14PM +0200, Eric Dumazet wrote:
> On Fri, 2012-09-14 at 14:08 +0200, Pablo Neira Ayuso wrote:
> > On Fri, Sep 14, 2012 at 01:54:22PM +0200, Patrick McHardy wrote:
> > > On Thu, 13 Sep 2012, Eric W. Biederman wrote:
> > >
> > > >xt_init in x_tables.c must be called before xt_nat_init in xt_nat.c
> > > >Reorder the makefile so that x_tables.o comes before xt_nat.o in
> > > >netfilter.o.
> > > >
> > > >This allows me to built a kernel with both of these modules compiled in.
> > >
> > > Thanks, we've already fixed that, the patch is queued in Pablo's tree.
> >
> > It should hit Linus tree soon, David pulled the fix yesterday.
> > --
>
> Little correction :
>
> Its in net-next, Linus tree doesnt need this fix yet.
>
> http://git.kernel.org/?p=linux/kernel/git/davem/net-next.git;a=commitdiff;h=00545bec9412d130c77f72a08d6c8b6ad21d4a1e
You're right, thanks for the clarification.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-09-14 12:46 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-14 2:32 [PATCH] netfilter: Allow xt_nat.c and x_tables.c to compiled in Eric W. Biederman
2012-09-14 3:33 ` Cong Wang
2012-09-14 11:54 ` Patrick McHardy
2012-09-14 12:08 ` Pablo Neira Ayuso
2012-09-14 12:25 ` Eric Dumazet
2012-09-14 12:46 ` 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).