diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-11-14 09:57:47 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 22:53:55 (GMT) |
| commit | 294b4baf292197e13d1df1d253efa7ac84ffee3f (patch) | |
| tree | f7f4fc0fa51e937829e2702faffa78b913895f99 | |
| parent | 6e23ae2a48750bda407a4a58f52a4865d7308bf5 (diff) | |
| download | linux-294b4baf292197e13d1df1d253efa7ac84ffee3f.tar.xz | |
[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>
| -rw-r--r-- | include/net/xfrm.h | 1 | ||||
| -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 |
4 files changed, 1 insertions, 4 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 37a086d..ecc02e9 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -259,7 +259,6 @@ struct xfrm_state_afinfo { unsigned int family; unsigned int proto; unsigned int eth_proto; - unsigned int nf_post_routing; struct module *owner; struct xfrm_type *type_map[IPPROTO_MAX]; struct xfrm_mode *mode_map[XFRM_MODE_MAX]; diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c index 2961135..fdeebe6 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 = { .family = AF_INET, .proto = IPPROTO_IPIP, .eth_proto = htons(ETH_P_IP), - .nf_post_routing = NF_INET_POST_ROUTING, .owner = THIS_MODULE, .init_flags = xfrm4_init_flags, .init_tempsel = __xfrm4_init_tempsel, diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c index 29e0d25..a7a7e8f 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 = { .family = AF_INET6, .proto = IPPROTO_IPV6, .eth_proto = htons(ETH_P_IPV6), - .nf_post_routing = NF_INET_POST_ROUTING, .owner = THIS_MODULE, .init_tempsel = __xfrm6_init_tempsel, .tmpl_sort = __xfrm6_tmpl_sort, diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index 048d240..3c277a4 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) return dst_output(skb); err = nf_hook(x->inner_mode->afinfo->family, - x->inner_mode->afinfo->nf_post_routing, skb, + NF_INET_POST_ROUTING, skb, NULL, skb->dst->dev, xfrm_output2); if (unlikely(err != 1)) goto out; |