diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-11-14 04:57:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:53:55 -0500 |
commit | 294b4baf292197e13d1df1d253efa7ac84ffee3f (patch) | |
tree | f7f4fc0fa51e937829e2702faffa78b913895f99 /net | |
parent | 6e23ae2a48750bda407a4a58f52a4865d7308bf5 (diff) |
[IPSEC]: Kill afinfo->nf_post_routing
After changeset:
[NETFILTER]: Introduce NF_INET_ hook values
It always evaluates to NF_INET_POST_ROUTING.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/xfrm4_state.c | 1 | ||||
-rw-r--r-- | net/ipv6/xfrm6_state.c | 1 | ||||
-rw-r--r-- | net/xfrm/xfrm_output.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c index 296113598944..fdeebe68a379 100644 --- a/net/ipv4/xfrm4_state.c +++ b/net/ipv4/xfrm4_state.c | |||
@@ -66,7 +66,6 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = { | |||
66 | .family = AF_INET, | 66 | .family = AF_INET, |
67 | .proto = IPPROTO_IPIP, | 67 | .proto = IPPROTO_IPIP, |
68 | .eth_proto = htons(ETH_P_IP), | 68 | .eth_proto = htons(ETH_P_IP), |
69 | .nf_post_routing = NF_INET_POST_ROUTING, | ||
70 | .owner = THIS_MODULE, | 69 | .owner = THIS_MODULE, |
71 | .init_flags = xfrm4_init_flags, | 70 | .init_flags = xfrm4_init_flags, |
72 | .init_tempsel = __xfrm4_init_tempsel, | 71 | .init_tempsel = __xfrm4_init_tempsel, |
diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c index 29e0d25b9e1e..a7a7e8fd6a33 100644 --- a/net/ipv6/xfrm6_state.c +++ b/net/ipv6/xfrm6_state.c | |||
@@ -188,7 +188,6 @@ static struct xfrm_state_afinfo xfrm6_state_afinfo = { | |||
188 | .family = AF_INET6, | 188 | .family = AF_INET6, |
189 | .proto = IPPROTO_IPV6, | 189 | .proto = IPPROTO_IPV6, |
190 | .eth_proto = htons(ETH_P_IPV6), | 190 | .eth_proto = htons(ETH_P_IPV6), |
191 | .nf_post_routing = NF_INET_POST_ROUTING, | ||
192 | .owner = THIS_MODULE, | 191 | .owner = THIS_MODULE, |
193 | .init_tempsel = __xfrm6_init_tempsel, | 192 | .init_tempsel = __xfrm6_init_tempsel, |
194 | .tmpl_sort = __xfrm6_tmpl_sort, | 193 | .tmpl_sort = __xfrm6_tmpl_sort, |
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index 048d240c3e15..3c277a4d0e78 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c | |||
@@ -113,7 +113,7 @@ int xfrm_output_resume(struct sk_buff *skb, int err) | |||
113 | return dst_output(skb); | 113 | return dst_output(skb); |
114 | 114 | ||
115 | err = nf_hook(x->inner_mode->afinfo->family, | 115 | err = nf_hook(x->inner_mode->afinfo->family, |
116 | x->inner_mode->afinfo->nf_post_routing, skb, | 116 | NF_INET_POST_ROUTING, skb, |
117 | NULL, skb->dst->dev, xfrm_output2); | 117 | NULL, skb->dst->dev, xfrm_output2); |
118 | if (unlikely(err != 1)) | 118 | if (unlikely(err != 1)) |
119 | goto out; | 119 | goto out; |