From: Patrick McHardy <kaber@trash.net>
Date: Wed, 5 Dec 2007 09:22:05 +0000 (-0800)
Subject: [NETFILTER]: nf_ct_h323: remove ipv6 module dependency
X-Git-Tag: v2.6.25-rc1~1162^2~1250
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1841a4c7ae106b7a3e2521db55f4d8bb8a0988d5;p=pandora-kernel.git

[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>
---

Reading git-diff-tree failed