l2tp: Fix L2TP_DEBUGFS ifdef tests.
Subsystems (3)
David Miller
maintainerPATCH 2/2 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 <[email protected]>
--- net/l2tp/l2tp_core.h | 2 +- net/l2tp/l2tp_eth.c | 4 ++-- net/l2tp/l2tp_ppp.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
net/l2tp/l2tp_core.h +1 -1
@@ -133,7 +133,7 @@ struct l2tp_session {void (*session_close)(struct l2tp_session *session);void (*ref)(struct l2tp_session *session);void (*deref)(struct l2tp_session *session); -#ifdef CONFIG_L2TP_DEBUGFS +#if defined(CONFIG_L2TP_DEBUGFS ) || defined(CONFIG_L2TP_DEBUGFS_MODULE )void (*show)(struct seq_file *m,void *priv);#endif uint8_t priv[0 ];/* private data */
net/l2tp/l2tp_eth.c +2 -2
@@ -172,7 +172,7 @@ static void l2tp_eth_delete(struct l2tp_session *session) } } -#ifdef CONFIG_L2TP_DEBUGFS +#if defined(CONFIG_L2TP_DEBUGFS ) || defined(CONFIG_L2TP_DEBUGFS_MODULE )static void l2tp_eth_show (struct seq_file *m,void *arg) {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 priv->tunnel_sock = tunnel->sock; session->recv_skb = l2tp_eth_dev_recv; session->session_close = l2tp_eth_delete; -#ifdef CONFIG_L2TP_DEBUGFS +#if defined(CONFIG_L2TP_DEBUGFS ) || defined(CONFIG_L2TP_DEBUGFS_MODULE ) session->show = l2tp_eth_show;#endif
net/l2tp/l2tp_ppp.c +2 -2
@@ -597,7 +597,7 @@ out:return error; } -#ifdef CONFIG_L2TP_DEBUGFS +#if defined(CONFIG_L2TP_DEBUGFS ) || defined(CONFIG_L2TP_DEBUGFS_MODULE )static void pppol2tp_show (struct seq_file *m,void *arg) {struct l2tp_session *session = arg;
@@ -748,7 +748,7 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr, session->recv_skb = pppol2tp_recv; session->session_close = pppol2tp_session_close; -#ifdef CONFIG_L2TP_DEBUGFS +#if defined(CONFIG_L2TP_DEBUGFS ) || defined(CONFIG_L2TP_DEBUGFS_MODULE ) session->show = pppol2tp_show;#endif
Signature · 1 line
1.7.0.4