diff options
Diffstat (limited to 'net/l2tp')
-rw-r--r-- | net/l2tp/l2tp_core.h | 2 | ||||
-rw-r--r-- | net/l2tp/l2tp_eth.c | 4 | ||||
-rw-r--r-- | net/l2tp/l2tp_ppp.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h index a961c77e0867..91b1b9ca5cfa 100644 --- a/net/l2tp/l2tp_core.h +++ b/net/l2tp/l2tp_core.h | |||
@@ -133,7 +133,7 @@ struct l2tp_session { | |||
133 | void (*session_close)(struct l2tp_session *session); | 133 | void (*session_close)(struct l2tp_session *session); |
134 | void (*ref)(struct l2tp_session *session); | 134 | void (*ref)(struct l2tp_session *session); |
135 | void (*deref)(struct l2tp_session *session); | 135 | void (*deref)(struct l2tp_session *session); |
136 | #ifdef CONFIG_L2TP_DEBUGFS | 136 | #if defined(CONFIG_L2TP_DEBUGFS) || defined(CONFIG_L2TP_DEBUGFS_MODULE) |
137 | void (*show)(struct seq_file *m, void *priv); | 137 | void (*show)(struct seq_file *m, void *priv); |
138 | #endif | 138 | #endif |
139 | uint8_t priv[0]; /* private data */ | 139 | uint8_t priv[0]; /* private data */ |
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 | ||
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) |
601 | static void pppol2tp_show(struct seq_file *m, void *arg) | 601 | static 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 | ||