Update kernel headers

Update kernel headers to commit:
    c4762993129f ("Merge branch 'skbuff-introduce-skbuff_heads-bulking-and-reusing'")

Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index c96880c51c93a15b306f2756be4d86fa09ee5e42..50193377e5e40e54cf33f0052b0914e868e1f151 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -809,7 +809,6 @@ enum {
        IFLA_GTP_FD1,
        IFLA_GTP_PDP_HASHSIZE,
        IFLA_GTP_ROLE,
-       IFLA_GTP_COLLECT_METADATA,
        __IFLA_GTP_MAX,
 };
 #define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1)

diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
index cb32781c0d42e634599457aa42fa560f595b37f0..c7f0a5e6adf15996efcaecc951ebb448e9a1acc6 100644 (file)
--- a/include/uapi/linux/if_tunnel.h
+++ b/include/uapi/linux/if_tunnel.h
@@ -176,7 +176,6 @@ enum {
 #define TUNNEL_VXLAN_OPT       __cpu_to_be16(0x1000)
 #define TUNNEL_NOCACHE         __cpu_to_be16(0x2000)
 #define TUNNEL_ERSPAN_OPT      __cpu_to_be16(0x4000)
-#define TUNNEL_GTPU_OPT                __cpu_to_be16(0x8000)
 
 #define TUNNEL_OPTIONS_PRESENT \
                (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT | TUNNEL_ERSPAN_OPT)

diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h
index d31c9c6c17c8257335b0710e08cd59deb5648df5..58ce1c6aab9b0c661f23f741b894268ea6c86126 100644 (file)
--- a/include/uapi/linux/mptcp.h
+++ b/include/uapi/linux/mptcp.h
@@ -36,6 +36,7 @@ enum {
 /* netlink interface */
 #define MPTCP_PM_NAME          "mptcp_pm"
 #define MPTCP_PM_CMD_GRP_NAME  "mptcp_pm_cmds"
+#define MPTCP_PM_EV_GRP_NAME   "mptcp_pm_events"
 #define MPTCP_PM_VER           0x1
 
 /*
@@ -104,4 +105,77 @@ struct mptcp_info {
        __u64   mptcpi_rcv_nxt;
 };
 
+/*
+ * MPTCP_EVENT_CREATED: token, family, saddr4 | saddr6, daddr4 | daddr6,
+ *                      sport, dport
+ * A new MPTCP connection has been created. It is the good time to allocate
+ * memory and send ADD_ADDR if needed. Depending on the traffic-patterns
+ * it can take a long time until the MPTCP_EVENT_ESTABLISHED is sent.
+ *
+ * MPTCP_EVENT_ESTABLISHED: token, family, saddr4 | saddr6, daddr4 | daddr6,
+ *                         sport, dport
+ * A MPTCP connection is established (can start new subflows).
+ *
+ * MPTCP_EVENT_CLOSED: token
+ * A MPTCP connection has stopped.
+ *
+ * MPTCP_EVENT_ANNOUNCED: token, rem_id, family, daddr4 | daddr6 [, dport]
+ * A new address has been announced by the peer.
+ *
+ * MPTCP_EVENT_REMOVED: token, rem_id
+ * An address has been lost by the peer.
+ *
+ * MPTCP_EVENT_SUB_ESTABLISHED: token, family, saddr4 | saddr6,
+ *                              daddr4 | daddr6, sport, dport, backup,
+ *                              if_idx [, error]
+ * A new subflow has been established. 'error' should not be set.
+ *
+ * MPTCP_EVENT_SUB_CLOSED: token, family, saddr4 | saddr6, daddr4 | daddr6,
+ *                         sport, dport, backup, if_idx [, error]
+ * A subflow has been closed. An error (copy of sk_err) could be set if an
+ * error has been detected for this subflow.
+ *
+ * MPTCP_EVENT_SUB_PRIORITY: token, family, saddr4 | saddr6, daddr4 | daddr6,
+ *                           sport, dport, backup, if_idx [, error]
+ *       The priority of a subflow has changed. 'error' should not be set.
+ */
+enum mptcp_event_type {
+       MPTCP_EVENT_UNSPEC = 0,
+       MPTCP_EVENT_CREATED = 1,
+       MPTCP_EVENT_ESTABLISHED = 2,
+       MPTCP_EVENT_CLOSED = 3,
+
+       MPTCP_EVENT_ANNOUNCED = 6,
+       MPTCP_EVENT_REMOVED = 7,
+
+       MPTCP_EVENT_SUB_ESTABLISHED = 10,
+       MPTCP_EVENT_SUB_CLOSED = 11,
+
+       MPTCP_EVENT_SUB_PRIORITY = 13,
+};
+
+enum mptcp_event_attr {
+       MPTCP_ATTR_UNSPEC = 0,
+
+       MPTCP_ATTR_TOKEN,       /* u32 */
+       MPTCP_ATTR_FAMILY,      /* u16 */
+       MPTCP_ATTR_LOC_ID,      /* u8 */
+       MPTCP_ATTR_REM_ID,      /* u8 */
+       MPTCP_ATTR_SADDR4,      /* be32 */
+       MPTCP_ATTR_SADDR6,      /* struct in6_addr */
+       MPTCP_ATTR_DADDR4,      /* be32 */
+       MPTCP_ATTR_DADDR6,      /* struct in6_addr */
+       MPTCP_ATTR_SPORT,       /* be16 */
+       MPTCP_ATTR_DPORT,       /* be16 */
+       MPTCP_ATTR_BACKUP,      /* u8 */
+       MPTCP_ATTR_ERROR,       /* u8 */
+       MPTCP_ATTR_FLAGS,       /* u16 */
+       MPTCP_ATTR_TIMEOUT,     /* u32 */
+       MPTCP_ATTR_IF_IDX,      /* s32 */
+
+       __MPTCP_ATTR_AFTER_LAST
+};
+
+#define MPTCP_ATTR_MAX (__MPTCP_ATTR_AFTER_LAST - 1)
+
 #endif /* _MPTCP_H */

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index c66fd247d90a9908e34dbc569ca9c676305cf981..b34b9add5f65e75ae95909da2b07d720a0061967 100644 (file)
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -319,6 +319,11 @@ enum rt_scope_t {
 #define RTM_F_FIB_MATCH                0x2000  /* return full fib lookup match */
 #define RTM_F_OFFLOAD          0x4000  /* route is offloaded */
 #define RTM_F_TRAP             0x8000  /* route is trapping packets */
+#define RTM_F_OFFLOAD_FAILED   0x20000000 /* route offload failed, this value
+                                           * is chosen to avoid conflicts with
+                                           * other flags defined in
+                                           * include/uapi/linux/ipv6_route.h
+                                           */
 
 /* Reserved table identifiers */
 

diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index 0614c6080a19fcba4702c23206103dd3923bf4f6..a206627884fc881b2b3c0fe40f61794a5a439d7f 100644 (file)
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -357,6 +357,6 @@ struct tcp_zerocopy_receive {
        __u64 msg_control; /* ancillary data */
        __u64 msg_controllen;
        __u32 msg_flags;
-       /* __u32 hole;  Next we must add >1 u32 otherwise length checks fail. */
+       __u32 reserved; /* set to 0 for now */
 };
 #endif /* _LINUX_TCP_H */