| Message ID | 87627hfi69.fsf@xmission.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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
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(-)