Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18dc6fbb authored by Asbjørn Sloth Tønnesen's avatar Asbjørn Sloth Tønnesen Committed by Greg Kroah-Hartman
Browse files

net: l2tp: export debug flags to UAPI 



commit 41c43fbee68f4f9a2a9675d83bca91c77862d7f0 upstream.

Move the L2TP_MSG_* definitions to UAPI, as it is part of
the netlink API.

Signed-off-by: default avatarAsbjoern Sloth Toennesen <asbjorn@asbjorn.st>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGiuliano Procida <gprocida@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f76905ce

include/uapi/linux/l2tp.h

+16 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ enum { 
	L2TP_ATTR_VLAN_ID,		/* u16 */

	L2TP_ATTR_COOKIE,		/* 0, 4 or 8 bytes */

	L2TP_ATTR_PEER_COOKIE,		/* 0, 4 or 8 bytes */

	L2TP_ATTR_DEBUG,		/* u32 */

	L2TP_ATTR_DEBUG,		/* u32, enum l2tp_debug_flags */

	L2TP_ATTR_RECV_SEQ,		/* u8 */

	L2TP_ATTR_SEND_SEQ,		/* u8 */

	L2TP_ATTR_LNS_MODE,		/* u8 */
@@ -175,6 +175,21 @@ enum l2tp_seqmode { 
	L2TP_SEQ_ALL = 2,

};



/**

 * enum l2tp_debug_flags - debug message categories for L2TP tunnels/sessions

 *

 * @L2TP_MSG_DEBUG: verbose debug (if compiled in)

 * @L2TP_MSG_CONTROL: userspace - kernel interface

 * @L2TP_MSG_SEQ: sequence numbers

 * @L2TP_MSG_DATA: data packets

 */

enum l2tp_debug_flags {

	L2TP_MSG_DEBUG		= (1 << 0),

	L2TP_MSG_CONTROL	= (1 << 1),

	L2TP_MSG_SEQ		= (1 << 2),

	L2TP_MSG_DATA		= (1 << 3),

};



/*

 * NETLINK_GENERIC related info

 */

net/l2tp/l2tp_core.h

+0 −10
Original line number Diff line number Diff line
@@ -23,16 +23,6 @@ 
#define L2TP_HASH_BITS_2	8

#define L2TP_HASH_SIZE_2	(1 << L2TP_HASH_BITS_2)



/* Debug message categories for the DEBUG socket option */

enum {

	L2TP_MSG_DEBUG		= (1 << 0),	/* verbose debug (if

						 * compiled in) */

	L2TP_MSG_CONTROL	= (1 << 1),	/* userspace - kernel

						 * interface */

	L2TP_MSG_SEQ		= (1 << 2),	/* sequence numbers */

	L2TP_MSG_DATA		= (1 << 3),	/* data packets */

};



struct sk_buff;



struct l2tp_stats {