Update kernel headers from 4.11 net-next

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

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 76bdb27b892247ae65548cea8219a77d9b1e9dad..16dc501fb8f2c97b014fdfdba361e11f21140cf6 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -472,7 +472,7 @@ union bpf_attr {
  *       > 0 length of the string including the trailing NUL on success
  *       < 0 error
  *
- * u64 bpf_bpf_get_socket_cookie(skb)
+ * u64 bpf_get_socket_cookie(skb)
  *     Get the cookie for the socket stored inside sk_buff.
  *     @skb: pointer to skb
  *     Return: 8 Bytes non-decreasing number on success or 0 if the socket

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index a982b3c004395d27d6f6ce1d93f3ab3fc077a9a3..3a53b9aaafc55004231e2a07a54f0be3454a8771 100644 (file)
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -50,12 +50,12 @@ struct nlmsghdr {
 
 /* Flags values */
 
-#define NLM_F_REQUEST          1       /* It is request message.       */
-#define NLM_F_MULTI            2       /* Multipart message, terminated by NLMSG_DONE */
-#define NLM_F_ACK              4       /* Reply with ack, with zero or error code */
-#define NLM_F_ECHO             8       /* Echo this request            */
-#define NLM_F_DUMP_INTR                16      /* Dump was inconsistent due to sequence change */
-#define NLM_F_DUMP_FILTERED    32      /* Dump was filtered as requested */
+#define NLM_F_REQUEST          0x01    /* It is request message.       */
+#define NLM_F_MULTI            0x02    /* Multipart message, terminated by NLMSG_DONE */
+#define NLM_F_ACK              0x04    /* Reply with ack, with zero or error code */
+#define NLM_F_ECHO             0x08    /* Echo this request            */
+#define NLM_F_DUMP_INTR                0x10    /* Dump was inconsistent due to sequence change */
+#define NLM_F_DUMP_FILTERED    0x20    /* Dump was filtered as requested */
 
 /* Modifiers to GET request */
 #define NLM_F_ROOT     0x100   /* specify tree root    */
@@ -69,6 +69,10 @@ struct nlmsghdr {
 #define NLM_F_CREATE   0x400   /* Create, if it does not exist */
 #define NLM_F_APPEND   0x800   /* Add to end of list           */
 
+/* Flags for ACK message */
+#define NLM_F_CAPPED   0x100   /* request was capped */
+#define NLM_F_ACK_TLVS 0x200   /* extended ACK TVLs were included */
+
 /*
    4.4BSD ADD          NLM_F_CREATE|NLM_F_EXCL
    4.4BSD CHANGE       NLM_F_REPLACE
@@ -101,6 +105,37 @@ struct nlmsghdr {
 struct nlmsgerr {
        int             error;
        struct nlmsghdr msg;
+       /*
+        * followed by the message contents unless NETLINK_CAP_ACK was set
+        * or the ACK indicates success (error == 0)
+        * message length is aligned with NLMSG_ALIGN()
+        */
+       /*
+        * followed by TLVs defined in enum nlmsgerr_attrs
+        * if NETLINK_EXT_ACK was set
+        */
+};
+
+/**
+ * enum nlmsgerr_attrs - nlmsgerr attributes
+ * @NLMSGERR_ATTR_UNUSED: unused
+ * @NLMSGERR_ATTR_MSG: error message string (string)
+ * @NLMSGERR_ATTR_OFFS: offset of the invalid attribute in the original
+ *      message, counting from the beginning of the header (u32)
+ * @NLMSGERR_ATTR_COOKIE: arbitrary subsystem specific cookie to
+ *     be used - in the success case - to identify a created
+ *     object or operation or similar (binary)
+ * @__NLMSGERR_ATTR_MAX: number of attributes
+ * @NLMSGERR_ATTR_MAX: highest attribute number
+ */
+enum nlmsgerr_attrs {
+       NLMSGERR_ATTR_UNUSED,
+       NLMSGERR_ATTR_MSG,
+       NLMSGERR_ATTR_OFFS,
+       NLMSGERR_ATTR_COOKIE,
+
+       __NLMSGERR_ATTR_MAX,
+       NLMSGERR_ATTR_MAX = __NLMSGERR_ATTR_MAX - 1
 };
 
 #define NETLINK_ADD_MEMBERSHIP         1
@@ -113,6 +148,7 @@ struct nlmsgerr {
 #define NETLINK_LISTEN_ALL_NSID                8
 #define NETLINK_LIST_MEMBERSHIPS       9
 #define NETLINK_CAP_ACK                        10
+#define NETLINK_EXT_ACK                        11
 
 struct nl_pktinfo {
        __u32   group;

diff --git a/include/linux/netlink_diag.h b/include/linux/netlink_diag.h
index defd25fb5f5af0e0564cb6e18df6a9da37112207..c8c8c7d2e530ba53d796cad74340a3f1525493d0 100644 (file)
--- a/include/linux/netlink_diag.h
+++ b/include/linux/netlink_diag.h
@@ -38,6 +38,7 @@ enum {
        NETLINK_DIAG_GROUPS,
        NETLINK_DIAG_RX_RING,
        NETLINK_DIAG_TX_RING,
+       NETLINK_DIAG_FLAGS,
 
        __NETLINK_DIAG_MAX,
 };
@@ -50,5 +51,14 @@ enum {
 #define NDIAG_SHOW_GROUPS      0x00000002 /* show groups of a netlink socket */
 /* deprecated since 4.6 */
 #define NDIAG_SHOW_RING_CFG    0x00000004 /* show ring configuration */
+#define NDIAG_SHOW_FLAGS       0x00000008 /* show flags of a netlink socket */
+
+/* flags */
+#define NDIAG_FLAG_CB_RUNNING          0x00000001
+#define NDIAG_FLAG_PKTINFO             0x00000002
+#define NDIAG_FLAG_BROADCAST_ERROR     0x00000004
+#define NDIAG_FLAG_NO_ENOBUFS          0x00000008
+#define NDIAG_FLAG_LISTEN_ALL_NSID     0x00000010
+#define NDIAG_FLAG_CAP_ACK             0x00000020
 
 #endif