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

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

net: l2tp: deprecate PPPOL2TP_MSG_* in favour of L2TP_MSG_* 



commit 47c3e7783be4e142b861d34b5c2e223330b05d8a upstream.

PPPOL2TP_MSG_* and L2TP_MSG_* are duplicates, and are being used
interchangeably in the kernel, so let's standardize on L2TP_MSG_*
internally, and keep PPPOL2TP_MSG_* defined in UAPI for compatibility.

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 18dc6fbb

Documentation/networking/l2tp.txt

+4 −4
Original line number Diff line number Diff line
@@ -177,10 +177,10 @@ setsockopt on the PPPoX socket to set a debug mask. 


The following debug mask bits are available:



PPPOL2TP_MSG_DEBUG    verbose debug (if compiled in)

PPPOL2TP_MSG_CONTROL  userspace - kernel interface

PPPOL2TP_MSG_SEQ      sequence numbers handling

PPPOL2TP_MSG_DATA     data packets

L2TP_MSG_DEBUG    verbose debug (if compiled in)

L2TP_MSG_CONTROL  userspace - kernel interface

L2TP_MSG_SEQ      sequence numbers handling

L2TP_MSG_DATA     data packets



If enabled, files under a l2tp debugfs directory can be used to dump

kernel state about L2TP tunnels and sessions. To access it, the

include/uapi/linux/if_pppol2tp.h

+6 −7
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/types.h>

#include <linux/in.h>

#include <linux/in6.h>

#include <linux/l2tp.h>



/* Structure used to connect() the socket to a particular tunnel UDP

 * socket over IPv4.
@@ -90,14 +91,12 @@ enum { 
	PPPOL2TP_SO_REORDERTO	= 5,

};



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

/* Debug message categories for the DEBUG socket option (deprecated) */

enum {

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

						 * compiled in) */

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

						 * interface */

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

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

	PPPOL2TP_MSG_DEBUG	= L2TP_MSG_DEBUG,

	PPPOL2TP_MSG_CONTROL	= L2TP_MSG_CONTROL,

	PPPOL2TP_MSG_SEQ	= L2TP_MSG_SEQ,

	PPPOL2TP_MSG_DATA	= L2TP_MSG_DATA,

};