bbs.cooldavid.org Git - net-next-2.6.git/commit

]> bbs.cooldavid.org Git - net-next-2.6.git/commit - net/ipv6/netfilter.c

git://bbs.cooldavid.org / net-next-2.6.git / commit

author	Patrick McHardy <kaber@trash.net>
	Wed, 5 Dec 2007 09:22:05 +0000 (01:22 -0800)
committer	David S. Miller <davem@davemloft.net>
	Mon, 28 Jan 2008 22:56:05 +0000 (14:56 -0800)
commit	1841a4c7ae106b7a3e2521db55f4d8bb8a0988d5
tree	50c64a8b67e9f2f768560f32792ea740042b3f08	tree \| snapshot (tar.bz2 tar.gz zip)
parent	193b23c5a0b270f045a4e77545e9020bfe73d5c4	commit \| diff

[NETFILTER]: nf_ct_h323: remove ipv6 module dependency

nf_conntrack_h323 needs ip6_route_output for the call forwarding filter.
Add a ->route function to nf_afinfo and use that to avoid pulling in the
ipv6 module.

Fix the #ifdef for the IPv6 code while I'm at it - the IPv6 support is
only needed when IPv6 conntrack is enabled.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

include/linux/netfilter.h		diff \| blob \| blame \| history
net/ipv4/netfilter.c		diff \| blob \| blame \| history
net/ipv6/netfilter.c		diff \| blob \| blame \| history
net/netfilter/nf_conntrack_h323_main.c		diff \| blob \| blame \| history

Clone of davem's net-next-2.6 tree

RSS Atom