aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
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 /include/linux
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 'include/linux')
-rw-r--r--include/linux/netfilter.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index f42e4362d50d..9bfc7d4f5868 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -298,10 +298,12 @@ extern void nf_invalidate_cache(int pf);
298 Returns true or false. */ 298 Returns true or false. */
299extern int skb_make_writable(struct sk_buff *skb, unsigned int writable_len); 299extern int skb_make_writable(struct sk_buff *skb, unsigned int writable_len);
300 300
301struct flowi;
301struct nf_afinfo { 302struct nf_afinfo {
302 unsigned short family; 303 unsigned short family;
303 __sum16 (*checksum)(struct sk_buff *skb, unsigned int hook, 304 __sum16 (*checksum)(struct sk_buff *skb, unsigned int hook,
304 unsigned int dataoff, u_int8_t protocol); 305 unsigned int dataoff, u_int8_t protocol);
306 int (*route)(struct dst_entry **dst, struct flowi *fl);
305 void (*saveroute)(const struct sk_buff *skb, 307 void (*saveroute)(const struct sk_buff *skb,
306 struct nf_info *info); 308 struct nf_info *info);
307 int (*reroute)(struct sk_buff *skb, 309 int (*reroute)(struct sk_buff *skb,