Update kernel headers

Update kernel headers to commit:
    bc37b24ee05e ("Merge branch 'mlx5-xsk-updates-part3-2022-09-30'")

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

diff --git a/include/uapi/linux/if_tun.h b/include/uapi/linux/if_tun.h
index 3e94e9e07816940584fdf1b865c7b05735162d28..9de547b6e69b6cdeaf54b1dc22f9d128e4dc8b03 100644 (file)
--- a/include/uapi/linux/if_tun.h
+++ b/include/uapi/linux/if_tun.h
@@ -67,6 +67,8 @@
 #define IFF_TAP                0x0002
 #define IFF_NAPI       0x0010
 #define IFF_NAPI_FRAGS 0x0020
+/* Used in TUNSETIFF to bring up tun/tap without carrier */
+#define IFF_NO_CARRIER 0x0040
 #define IFF_NO_PI      0x1000
 /* This flag has no real effect */
 #define IFF_ONE_QUEUE  0x2000

diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h
index 497ee7b20266564e71c206d1637c7909431faca6..47bac97ec76b3dbc9a30b434123ce90028fc981c 100644 (file)
--- a/include/uapi/linux/netlink.h
+++ b/include/uapi/linux/netlink.h
@@ -62,7 +62,7 @@ struct nlmsghdr {
 #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_ECHO             0x08    /* Receive resulting notifications */
 #define NLM_F_DUMP_INTR                0x10    /* Dump was inconsistent due to sequence change */
 #define NLM_F_DUMP_FILTERED    0x20    /* Dump was filtered as requested */
 

diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index f292b467b27fcc3e9d0320773665b0aab59e5f1b..000eec106856a4860e1b6a73dcfd5f91c0c9aa14 100644 (file)
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -1232,6 +1232,16 @@ enum {
 #define TCA_TAPRIO_ATTR_FLAG_TXTIME_ASSIST     _BITUL(0)
 #define TCA_TAPRIO_ATTR_FLAG_FULL_OFFLOAD      _BITUL(1)
 
+enum {
+       TCA_TAPRIO_TC_ENTRY_UNSPEC,
+       TCA_TAPRIO_TC_ENTRY_INDEX,              /* u32 */
+       TCA_TAPRIO_TC_ENTRY_MAX_SDU,            /* u32 */
+
+       /* add new constants above here */
+       __TCA_TAPRIO_TC_ENTRY_CNT,
+       TCA_TAPRIO_TC_ENTRY_MAX = (__TCA_TAPRIO_TC_ENTRY_CNT - 1)
+};
+
 enum {
        TCA_TAPRIO_ATTR_UNSPEC,
        TCA_TAPRIO_ATTR_PRIOMAP, /* struct tc_mqprio_qopt */
@@ -1245,6 +1255,7 @@ enum {
        TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME_EXTENSION, /* s64 */
        TCA_TAPRIO_ATTR_FLAGS, /* u32 */
        TCA_TAPRIO_ATTR_TXTIME_DELAY, /* u32 */
+       TCA_TAPRIO_ATTR_TC_ENTRY, /* nest */
        __TCA_TAPRIO_ATTR_MAX,
 };
 

diff --git a/include/uapi/linux/tc_act/tc_bpf.h b/include/uapi/linux/tc_act/tc_bpf.h
index 653c4f94f76e371cf08283010db13615f5d1dfc0..fe6c8f8f3e8c60961135609d5bce024979064ccc 100644 (file)
--- a/include/uapi/linux/tc_act/tc_bpf.h
+++ b/include/uapi/linux/tc_act/tc_bpf.h
@@ -1,11 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (c) 2015 Jiri Pirko <jiri@resnulli.us>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
  */
 
 #ifndef __LINUX_TC_BPF_H

diff --git a/include/uapi/linux/tc_act/tc_skbedit.h b/include/uapi/linux/tc_act/tc_skbedit.h
index 6cb6101208d0a7f75f4eae9f99d7b3886e8f51a2..64032513cc4cad0aea255adb97e18888cb405527 100644 (file)
--- a/include/uapi/linux/tc_act/tc_skbedit.h
+++ b/include/uapi/linux/tc_act/tc_skbedit.h
@@ -2,19 +2,6 @@
 /*
  * Copyright (c) 2008, Intel Corporation.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307 USA.
- *
  * Author: Alexander Duyck <alexander.h.duyck@intel.com>
  */
 

diff --git a/include/uapi/linux/tc_act/tc_skbmod.h b/include/uapi/linux/tc_act/tc_skbmod.h
index af6ef2cfbf3db8ef86937c4c9c85bfc7451c9b04..ac62c9a993ea07eb611505ef48a94b8500544bd3 100644 (file)
--- a/include/uapi/linux/tc_act/tc_skbmod.h
+++ b/include/uapi/linux/tc_act/tc_skbmod.h
@@ -1,12 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (c) 2016, Jamal Hadi Salim
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
-*/
+ */
 
 #ifndef __LINUX_TC_SKBMOD_H
 #define __LINUX_TC_SKBMOD_H

diff --git a/include/uapi/linux/tc_act/tc_tunnel_key.h b/include/uapi/linux/tc_act/tc_tunnel_key.h
index 3f10dc4e7a4bb43f8e0f0f013cdce23b3a3e1e8d..49ad4033951bf0feb3ddebba78a85feda2119234 100644 (file)
--- a/include/uapi/linux/tc_act/tc_tunnel_key.h
+++ b/include/uapi/linux/tc_act/tc_tunnel_key.h
@@ -2,11 +2,6 @@
 /*
  * Copyright (c) 2016, Amir Vadai <amir@vadai.me>
  * Copyright (c) 2016, Mellanox Technologies. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
  */
 
 #ifndef __LINUX_TC_TUNNEL_KEY_H

diff --git a/include/uapi/linux/tc_act/tc_vlan.h b/include/uapi/linux/tc_act/tc_vlan.h
index 5b306fe815ccb0a13a4a9763ed728964d390661c..3e1f8e57cdd26005dd30f43d3ea1e3e7e798db8c 100644 (file)
--- a/include/uapi/linux/tc_act/tc_vlan.h
+++ b/include/uapi/linux/tc_act/tc_vlan.h
@@ -1,11 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (c) 2014 Jiri Pirko <jiri@resnulli.us>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
  */
 
 #ifndef __LINUX_TC_VLAN_H

diff --git a/include/uapi/linux/tls.h b/include/uapi/linux/tls.h
index 6dc2d444f69f849edadeece3953a2d61a4b14f9e..dd7dea898f23779a092020e6e5069ec79ab71c17 100644 (file)
--- a/include/uapi/linux/tls.h
+++ b/include/uapi/linux/tls.h
@@ -100,6 +100,20 @@
 #define TLS_CIPHER_SM4_CCM_TAG_SIZE            16
 #define TLS_CIPHER_SM4_CCM_REC_SEQ_SIZE                8
 
+#define TLS_CIPHER_ARIA_GCM_128                                57
+#define TLS_CIPHER_ARIA_GCM_128_IV_SIZE                        8
+#define TLS_CIPHER_ARIA_GCM_128_KEY_SIZE               16
+#define TLS_CIPHER_ARIA_GCM_128_SALT_SIZE              4
+#define TLS_CIPHER_ARIA_GCM_128_TAG_SIZE               16
+#define TLS_CIPHER_ARIA_GCM_128_REC_SEQ_SIZE           8
+
+#define TLS_CIPHER_ARIA_GCM_256                                58
+#define TLS_CIPHER_ARIA_GCM_256_IV_SIZE                        8
+#define TLS_CIPHER_ARIA_GCM_256_KEY_SIZE               32
+#define TLS_CIPHER_ARIA_GCM_256_SALT_SIZE              4
+#define TLS_CIPHER_ARIA_GCM_256_TAG_SIZE               16
+#define TLS_CIPHER_ARIA_GCM_256_REC_SEQ_SIZE           8
+
 #define TLS_SET_RECORD_TYPE    1
 #define TLS_GET_RECORD_TYPE    2
 
@@ -156,6 +170,22 @@ struct tls12_crypto_info_sm4_ccm {
        unsigned char rec_seq[TLS_CIPHER_SM4_CCM_REC_SEQ_SIZE];
 };
 
+struct tls12_crypto_info_aria_gcm_128 {
+       struct tls_crypto_info info;
+       unsigned char iv[TLS_CIPHER_ARIA_GCM_128_IV_SIZE];
+       unsigned char key[TLS_CIPHER_ARIA_GCM_128_KEY_SIZE];
+       unsigned char salt[TLS_CIPHER_ARIA_GCM_128_SALT_SIZE];
+       unsigned char rec_seq[TLS_CIPHER_ARIA_GCM_128_REC_SEQ_SIZE];
+};
+
+struct tls12_crypto_info_aria_gcm_256 {
+       struct tls_crypto_info info;
+       unsigned char iv[TLS_CIPHER_ARIA_GCM_256_IV_SIZE];
+       unsigned char key[TLS_CIPHER_ARIA_GCM_256_KEY_SIZE];
+       unsigned char salt[TLS_CIPHER_ARIA_GCM_256_SALT_SIZE];
+       unsigned char rec_seq[TLS_CIPHER_ARIA_GCM_256_REC_SEQ_SIZE];
+};
+
 enum {
        TLS_INFO_UNSPEC,
        TLS_INFO_VERSION,