Update kernel headers

Update kernel headers to commit:
	e835faaed2f8: ("net/mlx5: Expose uar access and odp page fault counters")

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

diff --git a/include/uapi/linux/can/netlink.h b/include/uapi/linux/can/netlink.h
index 8ec98c21eaeeb499f082ce2c0809719e487055b9..5cf825ebc4d0e64d3ce052f5aa3dcea03a649189 100644 (file)
--- a/include/uapi/linux/can/netlink.h
+++ b/include/uapi/linux/can/netlink.h
@@ -101,8 +101,8 @@ struct can_ctrlmode {
 #define CAN_CTRLMODE_PRESUME_ACK       0x40    /* Ignore missing CAN ACKs */
 #define CAN_CTRLMODE_FD_NON_ISO                0x80    /* CAN FD in non-ISO mode */
 #define CAN_CTRLMODE_CC_LEN8_DLC       0x100   /* Classic CAN DLC option */
-#define CAN_CTRLMODE_TDC_AUTO          0x200   /* CAN transiver automatically calculates TDCV */
-#define CAN_CTRLMODE_TDC_MANUAL                0x400   /* TDCV is manually set up by user */
+#define CAN_CTRLMODE_TDC_AUTO          0x200   /* FD transceiver automatically calculates TDCV */
+#define CAN_CTRLMODE_TDC_MANUAL                0x400   /* FD TDCV is manually set up by user */
 
 /*
  * CAN device statistics
@@ -129,14 +129,14 @@ enum {
        IFLA_CAN_RESTART_MS,
        IFLA_CAN_RESTART,
        IFLA_CAN_BERR_COUNTER,
-       IFLA_CAN_DATA_BITTIMING,
-       IFLA_CAN_DATA_BITTIMING_CONST,
+       IFLA_CAN_DATA_BITTIMING, /* FD */
+       IFLA_CAN_DATA_BITTIMING_CONST, /* FD */
        IFLA_CAN_TERMINATION,
        IFLA_CAN_TERMINATION_CONST,
        IFLA_CAN_BITRATE_CONST,
-       IFLA_CAN_DATA_BITRATE_CONST,
+       IFLA_CAN_DATA_BITRATE_CONST, /* FD */
        IFLA_CAN_BITRATE_MAX,
-       IFLA_CAN_TDC,
+       IFLA_CAN_TDC, /* FD */
        IFLA_CAN_CTRLMODE_EXT,
 
        /* add new constants above here */
@@ -145,7 +145,7 @@ enum {
 };
 
 /*
- * CAN FD Transmitter Delay Compensation (TDC)
+ * CAN FD/XL Transmitter Delay Compensation (TDC)
  *
  * Please refer to struct can_tdc_const and can_tdc in
  * include/linux/can/bittiming.h for further details.

diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index bed5e0c11218d6cee7e7db441088fa7b9cdf302a..4d7509c4b84d992ec89e522ad934ac3586920d7a 100644 (file)
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -823,6 +823,8 @@ struct br_mcast_stats {
 /* bridge boolean options
  * BR_BOOLOPT_NO_LL_LEARN - disable learning from link-local packets
  * BR_BOOLOPT_MCAST_VLAN_SNOOPING - control vlan multicast snooping
+ * BR_BOOLOPT_FDB_LOCAL_VLAN_0 - local FDB entries installed by the bridge
+ *                               driver itself should only be added on VLAN 0
  *
  * IMPORTANT: if adding a new option do not forget to handle
  *            it in br_boolopt_toggle/get and bridge sysfs
@@ -832,6 +834,7 @@ enum br_boolopt_id {
        BR_BOOLOPT_MCAST_VLAN_SNOOPING,
        BR_BOOLOPT_MST_ENABLE,
        BR_BOOLOPT_MDB_OFFLOAD_FAIL_NOTIFICATION,
+       BR_BOOLOPT_FDB_LOCAL_VLAN_0,
        BR_BOOLOPT_MAX
 };
 

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 8c460dc3454ea81636461c9811af7773a5f39ff8..d05f5cc750ff4afa557bf2ea92f284c4decbcea8 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -379,6 +379,8 @@ enum {
        IFLA_DPLL_PIN,
        IFLA_MAX_PACING_OFFLOAD_HORIZON,
        IFLA_NETNS_IMMUTABLE,
+       IFLA_HEADROOM,
+       IFLA_TAILROOM,
        __IFLA_MAX
 };
 

diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h
index a0da2632f27416506118f67913288a847400ba2e..ac193ef707c59840accc4d08836649f164a7b072 100644 (file)
--- a/include/uapi/linux/mptcp.h
+++ b/include/uapi/linux/mptcp.h
@@ -29,19 +29,28 @@
 #define MPTCP_INFO_FLAG_FALLBACK               _BITUL(0)
 #define MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED    _BITUL(1)
 
-#define MPTCP_PM_ADDR_FLAG_SIGNAL                      (1 << 0)
-#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)
+#define MPTCP_PM_EV_FLAG_DENY_JOIN_ID0         _BITUL(0)
+#define MPTCP_PM_EV_FLAG_SERVER_SIDE           _BITUL(1)
+
+#define MPTCP_PM_ADDR_FLAG_SIGNAL              _BITUL(0)
+#define MPTCP_PM_ADDR_FLAG_SUBFLOW             _BITUL(1)
+#define MPTCP_PM_ADDR_FLAG_BACKUP              _BITUL(2)
+#define MPTCP_PM_ADDR_FLAG_FULLMESH            _BITUL(3)
+#define MPTCP_PM_ADDR_FLAG_IMPLICIT            _BITUL(4)
+#define MPTCP_PM_ADDR_FLAG_LAMINAR             _BITUL(5)
 
 struct mptcp_info {
        __u8    mptcpi_subflows;
+       #define mptcpi_extra_subflows mptcpi_subflows
        __u8    mptcpi_add_addr_signal;
        __u8    mptcpi_add_addr_accepted;
        __u8    mptcpi_subflows_max;
+       #define mptcpi_limit_extra_subflows mptcpi_subflows_max
        __u8    mptcpi_add_addr_signal_max;
+       #define mptcpi_endp_signal_max mptcpi_add_addr_signal_max
        __u8    mptcpi_add_addr_accepted_max;
+       #define mptcpi_limit_add_addr_accepted mptcpi_add_addr_accepted_max
+       /* 16-bit hole that can no longer be filled */
        __u32   mptcpi_flags;
        __u32   mptcpi_token;
        __u64   mptcpi_write_seq;
@@ -49,14 +58,17 @@ struct mptcp_info {
        __u64   mptcpi_rcv_nxt;
        __u8    mptcpi_local_addr_used;
        __u8    mptcpi_local_addr_max;
+       #define mptcpi_endp_subflow_max mptcpi_local_addr_max
        __u8    mptcpi_csum_enabled;
+       /* 8-bit hole that can no longer be filled */
        __u32   mptcpi_retransmits;
        __u64   mptcpi_bytes_retrans;
        __u64   mptcpi_bytes_sent;
        __u64   mptcpi_bytes_received;
        __u64   mptcpi_bytes_acked;
        __u8    mptcpi_subflows_total;
-       __u8    reserved[3];
+       __u8    mptcpi_endp_laminar_max;
+       __u8    reserved[2];
        __u32   mptcpi_last_data_sent;
        __u32   mptcpi_last_data_recv;
        __u32   mptcpi_last_ack_recv;

diff --git a/include/uapi/linux/mptcp_pm.h b/include/uapi/linux/mptcp_pm.h
index 6b5ef7936db92fd739e395cb5f17926dd7fe188a..4a4e5d38b3722ee0715e4789250cc257cd549f7d 100644 (file)
--- a/include/uapi/linux/mptcp_pm.h
+++ b/include/uapi/linux/mptcp_pm.h
@@ -16,10 +16,10 @@
  *   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. Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6,
- *   sport, dport, server-side.
+ *   sport, dport, [server-side], [flags].
  * @MPTCP_EVENT_ESTABLISHED: A MPTCP connection is established (can start new
  *   subflows). Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6,
- *   sport, dport, server-side.
+ *   sport, dport, [server-side], [flags].
  * @MPTCP_EVENT_CLOSED: A MPTCP connection has stopped. Attribute: token.
  * @MPTCP_EVENT_ANNOUNCED: A new address has been announced by the peer.
  *   Attributes: token, rem_id, family, daddr4 | daddr6 [, dport].

diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index 85b51e4c80ea42959ebbb013164a5e4e77863fea..e35d416b45d99f232763e098b20b5f1e8bda7f57 100644 (file)
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -316,6 +316,15 @@ struct tcp_info {
                                         * in milliseconds, including any
                                         * unfinished recovery.
                                         */
+       __u32   tcpi_received_ce;    /* # of CE marks received */
+       __u32   tcpi_delivered_e1_bytes;  /* Accurate ECN byte counters */
+       __u32   tcpi_delivered_e0_bytes;
+       __u32   tcpi_delivered_ce_bytes;
+       __u32   tcpi_received_e1_bytes;
+       __u32   tcpi_received_e0_bytes;
+       __u32   tcpi_received_ce_bytes;
+       __u16   tcpi_accecn_fail_mode;
+       __u16   tcpi_accecn_opt_seen;
 };
 
 /* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */