Commit 47d4305b authored Nov 14, 2005 by Krzysztof Oledzki Committed by David S. Miller Nov 14, 2005

[NETFILTER]: link 'netfilter' before ipv4



Staticaly linked nf_conntrack_ipv4 requires nf_conntrack. but currently
nf_conntrack is linked after it. This changes the order of ipv4 and netfilter
to fix this.

Signed-off-by: Krzysztof Oledzki <olenf@ans.pl>
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 37d2e7a2

net/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,8 +15,8 @@ obj-$(CONFIG_NET) += $(tmp-y)
		# LLC has to be linked before the files in net/802/
		obj-$(CONFIG_LLC) += llc/
		obj-$(CONFIG_NET) += ethernet/ 802/ sched/ netlink/
		obj-$(CONFIG_INET) += ipv4/
		obj-$(CONFIG_NETFILTER) += netfilter/
		obj-$(CONFIG_INET) += ipv4/
		obj-$(CONFIG_XFRM) += xfrm/
		obj-$(CONFIG_UNIX) += unix/
		ifneq ($(CONFIG_IPV6),)