diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-03 18:01:37 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-03 18:01:37 -0400 |
commit | f66ef2d0649b220874532dfb83b6b5b368f83591 (patch) | |
tree | b41ef57e89814e50f01e313fb75b9b0aba6fa21a /net/l2tp/l2tp_eth.c | |
parent | f481c0d86227156fb1691b166a11c3f0058e1cb2 (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_eth.c')
-rw-r--r-- | net/l2tp/l2tp_eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c index 9848faa3d163..ca1164afeb74 100644 --- a/net/l2tp/l2tp_eth.c +++ b/net/l2tp/l2tp_eth.c | |||
@@ -172,7 +172,7 @@ static void l2tp_eth_delete(struct l2tp_session *session) | |||
172 | } | 172 | } |
173 | } | 173 | } |
174 | 174 | ||
175 | #ifdef CONFIG_L2TP_DEBUGFS | 175 | #if defined(CONFIG_L2TP_DEBUGFS) || defined(CONFIG_L2TP_DEBUGFS_MODULE) |
176 | static void l2tp_eth_show(struct seq_file *m, void *arg) | 176 | static void l2tp_eth_show(struct seq_file *m, void *arg) |
177 | { | 177 | { |
178 | struct l2tp_session *session = arg; | 178 | struct l2tp_session *session = arg; |
@@ -244,7 +244,7 @@ static int l2tp_eth_create(struct net *net, u32 tunnel_id, u32 session_id, u32 p | |||
244 | priv->tunnel_sock = tunnel->sock; | 244 | priv->tunnel_sock = tunnel->sock; |
245 | session->recv_skb = l2tp_eth_dev_recv; | 245 | session->recv_skb = l2tp_eth_dev_recv; |
246 | session->session_close = l2tp_eth_delete; | 246 | session->session_close = l2tp_eth_delete; |
247 | #ifdef CONFIG_L2TP_DEBUGFS | 247 | #if defined(CONFIG_L2TP_DEBUGFS) || defined(CONFIG_L2TP_DEBUGFS_MODULE) |
248 | session->show = l2tp_eth_show; | 248 | session->show = l2tp_eth_show; |
249 | #endif | 249 | #endif |
250 | 250 | ||