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

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>

diff --git a/Documentation/networking/l2tp.txt b/Documentation/networking/l2tp.txt
index 4650a00ed012b38864799e2716721c359f218588..9bc271cdc9a820842e9960b3bcc989a973bea3b6 100644 (file)
--- a/Documentation/networking/l2tp.txt
+++ b/Documentation/networking/l2tp.txt
@@ -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

diff --git a/include/uapi/linux/if_pppol2tp.h b/include/uapi/linux/if_pppol2tp.h
index 4bd1f55d63773287e66644b48cea7fceae8f3a53..6418c4d10241c2f57d22a5d95275b55972ca52c9 100644 (file)
--- a/include/uapi/linux/if_pppol2tp.h
+++ b/include/uapi/linux/if_pppol2tp.h
@@ -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,
 };