evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Asbjoern Sloth Toennesen <asbjorn@asbjorn.st>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Giuliano Procida <gprocida@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Asbjørn Sloth Tønnesen 2020-05-22 00:57:20 +01:00 • committed by Greg Kroah-Hartman
parent 2ce994fa14
commit a471a623e7
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Documentation/networking/l2tp.txt
View file

@ -177,10 +177,10 @@ setsockopt on the PPPoX socket to set a debug mask.
The following debug mask bits are available: The following debug mask bits are available:
PPPOL2TP_MSG_DEBUG verbose debug (if compiled in) L2TP_MSG_DEBUG verbose debug (if compiled in)
PPPOL2TP_MSG_CONTROL userspace - kernel interface L2TP_MSG_CONTROL userspace - kernel interface
PPPOL2TP_MSG_SEQ sequence numbers handling L2TP_MSG_SEQ sequence numbers handling
PPPOL2TP_MSG_DATA data packets L2TP_MSG_DATA data packets
If enabled, files under a l2tp debugfs directory can be used to dump If enabled, files under a l2tp debugfs directory can be used to dump
kernel state about L2TP tunnels and sessions. To access it, the kernel state about L2TP tunnels and sessions. To access it, the

13
include/uapi/linux/if_pppol2tp.h
View file

@ -17,6 +17,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/l2tp.h>
/* Structure used to connect() the socket to a particular tunnel UDP /* Structure used to connect() the socket to a particular tunnel UDP
* socket over IPv4. * socket over IPv4.
@ -89,14 +90,12 @@ enum {
PPPOL2TP_SO_REORDERTO = 5, PPPOL2TP_SO_REORDERTO = 5,
}; };
/* Debug message categories for the DEBUG socket option */ /* Debug message categories for the DEBUG socket option (deprecated) */
enum { enum {
PPPOL2TP_MSG_DEBUG = (1 << 0), /* verbose debug (if PPPOL2TP_MSG_DEBUG = L2TP_MSG_DEBUG,
* compiled in) */ PPPOL2TP_MSG_CONTROL = L2TP_MSG_CONTROL,
PPPOL2TP_MSG_CONTROL = (1 << 1), /* userspace - kernel PPPOL2TP_MSG_SEQ = L2TP_MSG_SEQ,
* interface */ PPPOL2TP_MSG_DATA = L2TP_MSG_DATA,
PPPOL2TP_MSG_SEQ = (1 << 2), /* sequence numbers */
PPPOL2TP_MSG_DATA = (1 << 3), /* data packets */
}; };