Skip to contentSkip to conversation

netfilter: Allow xt_nat.c and x_tables.c to compiled in

PATCH In review Eric W. Biederman 5 participants 6 messages Sep 14, 2012

Subsystems (3)
Networking Network drivers netfilter
lore
Share & tools
lore

Eric W. Biederman

author
#0 lore raw

PATCH 1/1 netfilter: Allow xt_nat.c and x_tables.c to compiled in

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" <[email protected]>
---
 net/netfilter/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
net/netfilter/Makefile +3 -3
index 98244d4..1f652b6 100644
@@ -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
Signature · 1 line
1.7.5.4
#2 lore raw
In reply to Eric W. Biederman
Quoted 5 lines · Eric W. Biederman

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.

#3 lore raw
Quoted 9 lines · Patrick McHardy
Quoted 5 lines · Eric W. Biederman

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.

#4 lore raw
Quoted 7 lines · Pablo Neira Ayuso
Quoted 6 lines · Patrick McHardy
Quoted 4 lines · Eric W. Biederman

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.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

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

#5 lore raw
Quoted 12 lines · Eric Dumazet
Quoted 11 lines · Pablo Neira Ayuso
Quoted 9 lines · Patrick McHardy
Quoted 5 lines · Eric W. Biederman

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.

Quoted 8 lines
Quoted 2 lines

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.