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.
Showing the changes to include/uapi/linux (1 of 2 files). Show all
Unified · Split
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 19 | #include <linux/in.h> | 19 | #include <linux/in.h> |
| 20 | #include <linux/in6.h> | 20 | #include <linux/in6.h> |
| 21 | #include <linux/l2tp.h> | ||
| 21 | 22 | ||
| 22 | /* Structure used to connect() the socket to a particular tunnel UDP | 23 | /* Structure used to connect() the socket to a particular tunnel UDP |
| 23 | * socket over IPv4. | 24 | * socket over IPv4. |
| @@ -90,14 +91,12 @@ enum { · 66 unmodified lines | |||
| 90 | PPPOL2TP_SO_REORDERTO = 5, | 91 | PPPOL2TP_SO_REORDERTO = 5, |
| 91 | }; | 92 | }; |
| 92 | 93 | ||
| 93 | /* Debug message categories for the DEBUG socket option */ | 94 | /* Debug message categories for the DEBUG socket option (deprecated) */ |
| 94 | enum { | 95 | enum { |
| 95 | PPPOL2TP_MSG_DEBUG = (1 << 0), /* verbose debug (if | 96 | PPPOL2TP_MSG_DEBUG = L2TP_MSG_DEBUG, |
| 96 | * compiled in) */ | 97 | PPPOL2TP_MSG_CONTROL = L2TP_MSG_CONTROL, |
| 97 | PPPOL2TP_MSG_CONTROL = (1 << 1), /* userspace - kernel | 98 | PPPOL2TP_MSG_SEQ = L2TP_MSG_SEQ, |
| 98 | * interface */ | 99 | PPPOL2TP_MSG_DATA = L2TP_MSG_DATA, |
| 99 | PPPOL2TP_MSG_SEQ = (1 << 2), /* sequence numbers */ | ||
| 100 | PPPOL2TP_MSG_DATA = (1 << 3), /* data packets */ | ||
| 101 | }; | 100 | }; |
| 102 | 101 | ||
| 103 | 102 | ||