aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/net/ipv6
diff options
context:
space:
mode:
authorDavid Ahern <dsahern@gmail.com>2020-04-20 17:13:51 -0600
committerDavid S. Miller <davem@davemloft.net>2020-04-22 12:32:11 -0700
commit0c922a4850eba2e668f73a3f1153196e09abb251 (patch)
tree0e0ff01b12b1a5b316ad1b759a3550c2280b58d7 /net/ipv6
parentipv6: ndisc: RFC-ietf-6man-ra-pref64-09 is now published as RFC8781 (diff)
downloadwireguard-linux-0c922a4850eba2e668f73a3f1153196e09abb251.tar.xz
wireguard-linux-0c922a4850eba2e668f73a3f1153196e09abb251.zip
xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish
IPSKB_XFRM_TRANSFORMED and IP6SKB_XFRM_TRANSFORMED are skb flags set by xfrm code to tell other skb handlers that the packet has been passed through the xfrm output functions. Simplify the code and just always set them rather than conditionally based on netfilter enabled thus making the flag available for other users. Signed-off-by: David Ahern <dsahern@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/xfrm6_output.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index fbe51d40bd7e..e34167f790e6 100644
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -111,9 +111,7 @@ int xfrm6_output_finish(struct sock *sk, struct sk_buff *skb)
{
memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));
-#ifdef CONFIG_NETFILTER
IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED;
-#endif
return xfrm_output(sk, skb);
}