From e9c71ae311c26606324bad58d657dfaa7217dfb6 Mon Sep 17 00:00:00 2001 From: James Chapman Date: Fri, 2 Apr 2010 06:18:44 +0000 Subject: [PATCH] --- yaml --- r: 193939 b: refs/heads/master c: 9345471bca96d00d4196b3dcc4a5625f1bfae247 h: refs/heads/master i: 193937: 89e89a1564410206b389bc1f37b9ff3266fa6e2c 193935: f5b23ca2256a23c5b6c0d34a02fe97db3ec0d6e3 v: v3 --- [refs] | 2 +- trunk/net/l2tp/l2tp_ppp.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a8d05c97acec..c88233589b40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63f96072f9ba430aa348bc987c3d5a4f48bae301 +refs/heads/master: 9345471bca96d00d4196b3dcc4a5625f1bfae247 diff --git a/trunk/net/l2tp/l2tp_ppp.c b/trunk/net/l2tp/l2tp_ppp.c index baac072761aa..3ad290dd830a 100644 --- a/trunk/net/l2tp/l2tp_ppp.c +++ b/trunk/net/l2tp/l2tp_ppp.c @@ -1465,6 +1465,7 @@ static void pppol2tp_seq_session_show(struct seq_file *m, void *v) struct l2tp_session *session = v; struct l2tp_tunnel *tunnel = session->tunnel; struct pppol2tp_session *ps = l2tp_session_priv(session); + struct pppox_sock *po = pppox_sk(ps->sock); u32 ip = 0; u16 port = 0; @@ -1499,6 +1500,9 @@ static void pppol2tp_seq_session_show(struct seq_file *m, void *v) (unsigned long long)session->stats.rx_packets, (unsigned long long)session->stats.rx_bytes, (unsigned long long)session->stats.rx_errors); + + if (po) + seq_printf(m, " interface %s\n", ppp_dev_name(&po->chan)); } static int pppol2tp_seq_show(struct seq_file *m, void *v)