diff options
author | James Chapman <jchapman@katalix.com> | 2010-04-02 02:18:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-03 17:56:03 -0400 |
commit | 9345471bca96d00d4196b3dcc4a5625f1bfae247 (patch) | |
tree | ea35c7f3bed73c5bdba0fbbdac4566eafcf23edd | |
parent | 63f96072f9ba430aa348bc987c3d5a4f48bae301 (diff) |
l2tp: Add ppp device name to L2TP ppp session data
When dumping L2TP PPP sessions using /proc/net/pppol2tp, get the
assigned PPP device name from PPP using ppp_dev_name().
Signed-off-by: James Chapman <jchapman@katalix.com>
Reviewed-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/l2tp/l2tp_ppp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index baac072761aa..3ad290dd830a 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c | |||
@@ -1465,6 +1465,7 @@ static void pppol2tp_seq_session_show(struct seq_file *m, void *v) | |||
1465 | struct l2tp_session *session = v; | 1465 | struct l2tp_session *session = v; |
1466 | struct l2tp_tunnel *tunnel = session->tunnel; | 1466 | struct l2tp_tunnel *tunnel = session->tunnel; |
1467 | struct pppol2tp_session *ps = l2tp_session_priv(session); | 1467 | struct pppol2tp_session *ps = l2tp_session_priv(session); |
1468 | struct pppox_sock *po = pppox_sk(ps->sock); | ||
1468 | u32 ip = 0; | 1469 | u32 ip = 0; |
1469 | u16 port = 0; | 1470 | u16 port = 0; |
1470 | 1471 | ||
@@ -1499,6 +1500,9 @@ static void pppol2tp_seq_session_show(struct seq_file *m, void *v) | |||
1499 | (unsigned long long)session->stats.rx_packets, | 1500 | (unsigned long long)session->stats.rx_packets, |
1500 | (unsigned long long)session->stats.rx_bytes, | 1501 | (unsigned long long)session->stats.rx_bytes, |
1501 | (unsigned long long)session->stats.rx_errors); | 1502 | (unsigned long long)session->stats.rx_errors); |
1503 | |||
1504 | if (po) | ||
1505 | seq_printf(m, " interface %s\n", ppp_dev_name(&po->chan)); | ||
1502 | } | 1506 | } |
1503 | 1507 | ||
1504 | static int pppol2tp_seq_show(struct seq_file *m, void *v) | 1508 | static int pppol2tp_seq_show(struct seq_file *m, void *v) |