aboutsummaryrefslogtreecommitdiffstats
path: root/net/l2tp/l2tp_ppp.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-04-03 18:01:37 -0400
committerDavid S. Miller <davem@davemloft.net>2010-04-03 18:01:37 -0400
commitf66ef2d0649b220874532dfb83b6b5b368f83591 (patch)
treeb41ef57e89814e50f01e313fb75b9b0aba6fa21a /net/l2tp/l2tp_ppp.c
parentf481c0d86227156fb1691b166a11c3f0058e1cb2 (diff)
l2tp: Fix L2TP_DEBUGFS ifdef tests.
We have to check CONFIG_L2TP_DEBUGFS_MODULE as well as CONFIG_L2TP_DEBUGFS. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp/l2tp_ppp.c')
-rw-r--r--net/l2tp/l2tp_ppp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 1ef10e4118d2..90d82b3f2889 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -597,7 +597,7 @@ out:
597 return error; 597 return error;
598} 598}
599 599
600#ifdef CONFIG_L2TP_DEBUGFS 600#if defined(CONFIG_L2TP_DEBUGFS) || defined(CONFIG_L2TP_DEBUGFS_MODULE)
601static void pppol2tp_show(struct seq_file *m, void *arg) 601static void pppol2tp_show(struct seq_file *m, void *arg)
602{ 602{
603 struct l2tp_session *session = arg; 603 struct l2tp_session *session = arg;
@@ -748,7 +748,7 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
748 748
749 session->recv_skb = pppol2tp_recv; 749 session->recv_skb = pppol2tp_recv;
750 session->session_close = pppol2tp_session_close; 750 session->session_close = pppol2tp_session_close;
751#ifdef CONFIG_L2TP_DEBUGFS 751#if defined(CONFIG_L2TP_DEBUGFS) || defined(CONFIG_L2TP_DEBUGFS_MODULE)
752 session->show = pppol2tp_show; 752 session->show = pppol2tp_show;
753#endif 753#endif
754 754