Commit f66ef2d0 authored by David S. Miller's avatar David S. Miller
Browse files

l2tp: Fix L2TP_DEBUGFS ifdef tests. 



We have to check CONFIG_L2TP_DEBUGFS_MODULE as well as
CONFIG_L2TP_DEBUGFS.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f481c0d8

net/l2tp/l2tp_core.h

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ static int pppol2tp_create(struct net *net, struct socket *sock) 
	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