diff options
| author |   Guillaume Nault <g.nault@alphalink.fr> | 2018-08-10 13:21:55 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-08-11 12:13:49 -0700 |
| commit | d6a61ec936676dbe25a6eb76e1229787dc2fbba8 (patch) | |
| tree | 6365ef6a97498aee99a5131bef45375d72d3d65a /net/l2tp/l2tp_ppp.c | |
| parent | Merge branch 'netsec-driver-improvements' (diff) | |
| download | linux-dev-d6a61ec936676dbe25a6eb76e1229787dc2fbba8.tar.xz linux-dev-d6a61ec936676dbe25a6eb76e1229787dc2fbba8.zip | |
l2tp: define l2tp_tunnel_uses_xfrm()
Use helper function to figure out if a tunnel is using ipsec.
Also, avoid accessing ->sk_policy directly since it's RCU protected.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/l2tp/l2tp_ppp.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 6e2c8e7595e0..c33ef9a3f3b5 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -95,7 +95,6 @@ #include <net/netns/generic.h> #include <net/ip.h> #include <net/udp.h> -#include <net/xfrm.h> #include <net/inet_common.h> #include <asm/byteorder.h> @@ -1153,9 +1152,7 @@ static int pppol2tp_tunnel_ioctl(struct l2tp_tunnel *tunnel, l2tp_session_dec_refcount(session); break; } -#ifdef CONFIG_XFRM - stats.using_ipsec = (sk->sk_policy[0] || sk->sk_policy[1]) ? 1 : 0; -#endif + stats.using_ipsec = l2tp_tunnel_uses_xfrm(tunnel); pppol2tp_copy_stats(&stats, &tunnel->stats); if (copy_to_user((void __user *) arg, &stats, sizeof(stats))) { err = -EFAULT; |