l2tp: don't use tunnel socket sk_user_data in ppp procfs output

l2tp's ppp procfs output can be used to show internal state of
pppol2tp. It includes a 'user-data-ok' field, which is derived from
the tunnel socket's sk_user_data being non-NULL. Use tunnel->sock
being non-NULL to indicate this instead.

Signed-off-by: James Chapman <jchapman@katalix.com>
Signed-off-by: Tom Parkin <tparkin@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 3596290047b28e65e56eec0a511e0a1263ec44c9..0844b86cd0a645ec8aa6ce0e14a57e260cc88d88 100644 (file)
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -1513,7 +1513,7 @@ static void pppol2tp_seq_tunnel_show(struct seq_file *m, void *v)
 
        seq_printf(m, "\nTUNNEL '%s', %c %d\n",
                   tunnel->name,
-                  (tunnel == tunnel->sock->sk_user_data) ? 'Y' : 'N',
+                  tunnel->sock ? 'Y' : 'N',
                   refcount_read(&tunnel->ref_count) - 1);
        seq_printf(m, " %08x %ld/%ld/%ld %ld/%ld/%ld\n",
                   0,