From mboxrd@z Thu Jan 1 00:00:00 1970 From: James Chapman Subject: [PATCH v3 04/12] l2tp: Add ppp device name to L2TP ppp session data Date: Tue, 30 Mar 2010 17:17:46 +0100 Message-ID: <20100330161746.9628.40723.stgit@bert.katalix.com> References: <20100330161725.9628.69994.stgit@bert.katalix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: netdev@vger.kernel.org Return-path: Received: from katalix.com ([82.103.140.233]:49344 "EHLO mail.katalix.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752764Ab0C3QRd (ORCPT ); Tue, 30 Mar 2010 12:17:33 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.katalix.com (Postfix) with ESMTP id ED4E0A620AC for ; Tue, 30 Mar 2010 17:17:52 +0100 (BST) Received: from mail.katalix.com ([127.0.0.1]) by localhost (mail.katalix.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id i-7fxGUf1RdA for ; Tue, 30 Mar 2010 17:17:47 +0100 (BST) Received: from bert.katalix.com (localhost.localdomain [127.0.0.1]) by mail.katalix.com (Postfix) with ESMTP id B9CA8A620AD for ; Tue, 30 Mar 2010 17:17:46 +0100 (BST) In-Reply-To: <20100330161725.9628.69994.stgit@bert.katalix.com> Sender: netdev-owner@vger.kernel.org List-ID: When dumping L2TP PPP sessions using /proc/net/l2tp, get the assigned PPP device name from PPP using ppp_dev_name(). Signed-off-by: James Chapman Reviewed-by: Randy Dunlap --- net/l2tp/l2tp_ppp.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 03195ab..8f78c27 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -608,6 +608,20 @@ out: return error; } +#ifdef CONFIG_PROC_FS +static void pppol2tp_show(struct seq_file *m, void *arg) +{ + struct l2tp_session *session = arg; + struct pppol2tp_session *ps = l2tp_session_priv(session); + + if (ps) { + struct pppox_sock *po = pppox_sk(ps->sock); + if (po) + seq_printf(m, " interface %s\n", ppp_dev_name(&po->chan)); + } +} +#endif + /* connect() handler. Attach a PPPoX socket to a tunnel UDP socket */ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr, @@ -697,6 +711,9 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr, session->recv_skb = pppol2tp_recv; session->session_close = pppol2tp_session_close; +#ifdef CONFIG_PROC_FS + session->show = pppol2tp_show; +#endif /* We need to know each time a skb is dropped from the reorder * queue.