aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-12-05 04:22:05 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:56:05 -0500
commit1841a4c7ae106b7a3e2521db55f4d8bb8a0988d5 (patch)
tree50c64a8b67e9f2f768560f32792ea740042b3f08 /net/ipv4
parent193b23c5a0b270f045a4e77545e9020bfe73d5c4 (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>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/netfilter.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
index d9022467e089..599d448ef57e 100644
--- a/net/ipv4/netfilter.c
+++ b/net/ipv4/netfilter.c
@@ -182,9 +182,15 @@ __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
182 182
183EXPORT_SYMBOL(nf_ip_checksum); 183EXPORT_SYMBOL(nf_ip_checksum);
184 184
185static int nf_ip_route(struct dst_entry **dst, struct flowi *fl)
186{
187 return ip_route_output_key((struct rtable **)dst, fl);
188}
189
185static struct nf_afinfo nf_ip_afinfo = { 190static struct nf_afinfo nf_ip_afinfo = {
186 .family = AF_INET, 191 .family = AF_INET,
187 .checksum = nf_ip_checksum, 192 .checksum = nf_ip_checksum,
193 .route = nf_ip_route,
188 .saveroute = nf_ip_saveroute, 194 .saveroute = nf_ip_saveroute,
189 .reroute = nf_ip_reroute, 195 .reroute = nf_ip_reroute,
190 .route_key_size = sizeof(struct ip_rt_info), 196 .route_key_size = sizeof(struct ip_rt_info),