[NETFILTER]: nf_ct_h323: remove ipv6 module dependency
authorPatrick McHardy <kaber@trash.net>
Wed, 5 Dec 2007 09:22:05 +0000 (01:22 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2008 22:56:05 +0000 (14:56 -0800)
commit1841a4c7ae106b7a3e2521db55f4d8bb8a0988d5
tree50c64a8b67e9f2f768560f32792ea740042b3f08
parent193b23c5a0b270f045a4e77545e9020bfe73d5c4
[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
net/ipv4/netfilter.c
net/ipv6/netfilter.c
net/netfilter/nf_conntrack_h323_main.c