Update kernel headers

Update kernel headers to commit:
    092d992b76ed ("Merge tag 'mlx5-updates-2022-03-18' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux")

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

diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index d1b5fdeeb4afa4936406cfb4d02f737b12de3b7d..f6d58238684870c32e3cabb6886b5de3e84d85ac 100644 (file)
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -122,6 +122,7 @@ enum {
        IFLA_BRIDGE_VLAN_TUNNEL_INFO,
        IFLA_BRIDGE_MRP,
        IFLA_BRIDGE_CFM,
+       IFLA_BRIDGE_MST,
        __IFLA_BRIDGE_MAX,
 };
 #define IFLA_BRIDGE_MAX (__IFLA_BRIDGE_MAX - 1)
@@ -453,6 +454,21 @@ enum {
 
 #define IFLA_BRIDGE_CFM_CC_PEER_STATUS_MAX (__IFLA_BRIDGE_CFM_CC_PEER_STATUS_MAX - 1)
 
+enum {
+       IFLA_BRIDGE_MST_UNSPEC,
+       IFLA_BRIDGE_MST_ENTRY,
+       __IFLA_BRIDGE_MST_MAX,
+};
+#define IFLA_BRIDGE_MST_MAX (__IFLA_BRIDGE_MST_MAX - 1)
+
+enum {
+       IFLA_BRIDGE_MST_ENTRY_UNSPEC,
+       IFLA_BRIDGE_MST_ENTRY_MSTI,
+       IFLA_BRIDGE_MST_ENTRY_STATE,
+       __IFLA_BRIDGE_MST_ENTRY_MAX,
+};
+#define IFLA_BRIDGE_MST_ENTRY_MAX (__IFLA_BRIDGE_MST_ENTRY_MAX - 1)
+
 struct bridge_stp_xstats {
        __u64 transition_blk;
        __u64 transition_fwd;
@@ -564,6 +580,7 @@ enum {
        BRIDGE_VLANDB_GOPTS_MCAST_QUERIER,
        BRIDGE_VLANDB_GOPTS_MCAST_ROUTER_PORTS,
        BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_STATE,
+       BRIDGE_VLANDB_GOPTS_MSTI,
        __BRIDGE_VLANDB_GOPTS_MAX
 };
 #define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)
@@ -759,6 +776,7 @@ struct br_mcast_stats {
 enum br_boolopt_id {
        BR_BOOLOPT_NO_LL_LEARN,
        BR_BOOLOPT_MCAST_VLAN_SNOOPING,
+       BR_BOOLOPT_MST_ENABLE,
        BR_BOOLOPT_MAX
 };
 

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 5f36ff8e8c26125084bb6db81877e60021708d0e..22e21e57afc942f66e69fba4dda6807f8fa85421 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -840,6 +840,7 @@ enum {
        IFLA_GENEVE_LABEL,
        IFLA_GENEVE_TTL_INHERIT,
        IFLA_GENEVE_DF,
+       IFLA_GENEVE_INNER_PROTO_INHERIT,
        __IFLA_GENEVE_MAX
 };
 #define IFLA_GENEVE_MAX        (__IFLA_GENEVE_MAX - 1)
@@ -885,6 +886,8 @@ enum {
        IFLA_GTP_FD1,
        IFLA_GTP_PDP_HASHSIZE,
        IFLA_GTP_ROLE,
+       IFLA_GTP_CREATE_SOCKETS,
+       IFLA_GTP_RESTART_COUNT,
        __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 c7f0a5e6adf15996efcaecc951ebb448e9a1acc6..edaea41cc38d11204b83ce66734dad1ef43b1cec 100644 (file)
--- a/include/uapi/linux/if_tunnel.h
+++ b/include/uapi/linux/if_tunnel.h
@@ -176,8 +176,10 @@ 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_GTP_OPT         __cpu_to_be16(0x8000)
 
 #define TUNNEL_OPTIONS_PRESENT \
-               (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT | TUNNEL_ERSPAN_OPT)
+               (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT | TUNNEL_ERSPAN_OPT | \
+               TUNNEL_GTP_OPT)
 
 #endif /* _IF_TUNNEL_H_ */

diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h
index cefa9a91f19fe680f650ef0e6ad8263f98882010..ca502f1edccfb1f37f8142bbbc17f9d4ca0cb5d6 100644 (file)
--- a/include/uapi/linux/mptcp.h
+++ b/include/uapi/linux/mptcp.h
@@ -79,6 +79,7 @@ enum {
 #define MPTCP_PM_ADDR_FLAG_SUBFLOW                     (1 << 1)
 #define MPTCP_PM_ADDR_FLAG_BACKUP                      (1 << 2)
 #define MPTCP_PM_ADDR_FLAG_FULLMESH                    (1 << 3)
+#define MPTCP_PM_ADDR_FLAG_IMPLICIT                    (1 << 4)
 
 enum {
        MPTCP_PM_CMD_UNSPEC,

diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index ee38b35c3f57e5162ef26cc274d4688fe3a00721..404f97fb239c40b033e5169b0024606ce730d79b 100644 (file)
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -616,6 +616,10 @@ enum {
                                         * TCA_FLOWER_KEY_ENC_OPT_ERSPAN_
                                         * attributes
                                         */
+       TCA_FLOWER_KEY_ENC_OPTS_GTP,    /* Nested
+                                        * TCA_FLOWER_KEY_ENC_OPT_GTP_
+                                        * attributes
+                                        */
        __TCA_FLOWER_KEY_ENC_OPTS_MAX,
 };
 
@@ -654,6 +658,17 @@ enum {
 #define TCA_FLOWER_KEY_ENC_OPT_ERSPAN_MAX \
                (__TCA_FLOWER_KEY_ENC_OPT_ERSPAN_MAX - 1)
 
+enum {
+       TCA_FLOWER_KEY_ENC_OPT_GTP_UNSPEC,
+       TCA_FLOWER_KEY_ENC_OPT_GTP_PDU_TYPE,            /* u8 */
+       TCA_FLOWER_KEY_ENC_OPT_GTP_QFI,                 /* u8 */
+
+       __TCA_FLOWER_KEY_ENC_OPT_GTP_MAX,
+};
+
+#define TCA_FLOWER_KEY_ENC_OPT_GTP_MAX \
+               (__TCA_FLOWER_KEY_ENC_OPT_GTP_MAX - 1)
+
 enum {
        TCA_FLOWER_KEY_MPLS_OPTS_UNSPEC,
        TCA_FLOWER_KEY_MPLS_OPTS_LSE,

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 0b3358d75efa96f47ade58a10bc971b09d4e55ef..8f874be7f01e518c3b793bc4b7216b2d722f47b6 100644 (file)
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -815,6 +815,7 @@ enum {
 #define RTEXT_FILTER_MRP       (1 << 4)
 #define RTEXT_FILTER_CFM_CONFIG        (1 << 5)
 #define RTEXT_FILTER_CFM_STATUS        (1 << 6)
+#define RTEXT_FILTER_MST       (1 << 7)
 
 /* End of information exported to user level */
 

diff --git a/ip/iplink.c b/ip/iplink.c
index c0a3a9ad3e629986ee2da0ee80eaf758f98aee5f..1e8c51486f9b45316680df4f77cfa288ba50dc02 100644 (file)
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -927,8 +927,7 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, char **type)
                        unsigned int max_size;
 
                        NEXT_ARG();
-                       if (get_unsigned(&max_size, *argv, 0) ||
-                           max_size > GSO_MAX_SIZE)
+                       if (get_unsigned(&max_size, *argv, 0))
                                invarg("Invalid \"gso_max_size\" value\n",
                                       *argv);
                        addattr32(&req->n, sizeof(*req),