update to net-next headers (pre 4.10 rc)

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/include/linux/l2tp.h b/include/linux/l2tp.h
index b7285c91ba6661a6e457ba823bca26f5f0bf6245..ac22738e459846f94e7a0b4c809775ca8506ee64 100644 (file)
--- a/include/linux/l2tp.h
+++ b/include/linux/l2tp.h
@@ -106,7 +106,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 */
@@ -173,6 +173,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
  */