Commit 294b4baf authored by David S. Miller's avatar David S. Miller Committed by David S. Miller

[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: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e23ae2a
...@@ -259,7 +259,6 @@ struct xfrm_state_afinfo { ...@@ -259,7 +259,6 @@ struct xfrm_state_afinfo {
unsigned int family; unsigned int family;
unsigned int proto; unsigned int proto;
unsigned int eth_proto; unsigned int eth_proto;
unsigned int nf_post_routing;
struct module *owner; struct module *owner;
struct xfrm_type *type_map[IPPROTO_MAX]; struct xfrm_type *type_map[IPPROTO_MAX];
struct xfrm_mode *mode_map[XFRM_MODE_MAX]; struct xfrm_mode *mode_map[XFRM_MODE_MAX];
......
...@@ -66,7 +66,6 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = { ...@@ -66,7 +66,6 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = {
.family = AF_INET, .family = AF_INET,
.proto = IPPROTO_IPIP, .proto = IPPROTO_IPIP,
.eth_proto = htons(ETH_P_IP), .eth_proto = htons(ETH_P_IP),
.nf_post_routing = NF_INET_POST_ROUTING,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.init_flags = xfrm4_init_flags, .init_flags = xfrm4_init_flags,
.init_tempsel = __xfrm4_init_tempsel, .init_tempsel = __xfrm4_init_tempsel,
......
...@@ -188,7 +188,6 @@ static struct xfrm_state_afinfo xfrm6_state_afinfo = { ...@@ -188,7 +188,6 @@ static struct xfrm_state_afinfo xfrm6_state_afinfo = {
.family = AF_INET6, .family = AF_INET6,
.proto = IPPROTO_IPV6, .proto = IPPROTO_IPV6,
.eth_proto = htons(ETH_P_IPV6), .eth_proto = htons(ETH_P_IPV6),
.nf_post_routing = NF_INET_POST_ROUTING,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.init_tempsel = __xfrm6_init_tempsel, .init_tempsel = __xfrm6_init_tempsel,
.tmpl_sort = __xfrm6_tmpl_sort, .tmpl_sort = __xfrm6_tmpl_sort,
......
...@@ -113,7 +113,7 @@ int xfrm_output_resume(struct sk_buff *skb, int err) ...@@ -113,7 +113,7 @@ int xfrm_output_resume(struct sk_buff *skb, int err)
return dst_output(skb); return dst_output(skb);
err = nf_hook(x->inner_mode->afinfo->family, 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); NULL, skb->dst->dev, xfrm_output2);
if (unlikely(err != 1)) if (unlikely(err != 1))
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment