tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by

David S. Miller and committed by
David S. Miller 294b4baf 6e23ae2a

+1 -4
-1
include/net/xfrm.h
··· 259 259 unsigned int family; 260 260 unsigned int proto; 261 261 unsigned int eth_proto; 262 - unsigned int nf_post_routing; 263 262 struct module *owner; 264 263 struct xfrm_type *type_map[IPPROTO_MAX]; 265 264 struct xfrm_mode *mode_map[XFRM_MODE_MAX];
-1
net/ipv4/xfrm4_state.c
··· 66 66 .family = AF_INET, 67 67 .proto = IPPROTO_IPIP, 68 68 .eth_proto = htons(ETH_P_IP), 69 - .nf_post_routing = NF_INET_POST_ROUTING, 70 69 .owner = THIS_MODULE, 71 70 .init_flags = xfrm4_init_flags, 72 71 .init_tempsel = __xfrm4_init_tempsel,
-1
net/ipv6/xfrm6_state.c
··· 188 188 .family = AF_INET6, 189 189 .proto = IPPROTO_IPV6, 190 190 .eth_proto = htons(ETH_P_IPV6), 191 - .nf_post_routing = NF_INET_POST_ROUTING, 192 191 .owner = THIS_MODULE, 193 192 .init_tempsel = __xfrm6_init_tempsel, 194 193 .tmpl_sort = __xfrm6_tmpl_sort,
+1 -1
net/xfrm/xfrm_output.c
··· 113 113 return dst_output(skb); 114 114 115 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 117 NULL, skb->dst->dev, xfrm_output2); 118 118 if (unlikely(err != 1)) 119 119 goto out;