Update kernel headers

Update kernel headers to commit:
    cec85994c6b4 ("bareudp: constify device_type declaration")

Signed-off-by: David Ahern <dsahern@gmail.com>

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index e639a4e5c78575c0f5a5845da44632c06295807b..1414aceeeab2e5aa48180505281cd390f4e6a2d3 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -526,6 +526,8 @@ enum devlink_attr {
        DEVLINK_ATTR_RELOAD_STATS_LIMIT,        /* u8 */
        DEVLINK_ATTR_RELOAD_STATS_VALUE,        /* u32 */
        DEVLINK_ATTR_REMOTE_RELOAD_STATS,       /* nested */
+       DEVLINK_ATTR_RELOAD_ACTION_INFO,        /* nested */
+       DEVLINK_ATTR_RELOAD_ACTION_STATS,       /* nested */
 
        /* add new attributes above here, update the policy in devlink.c */
 

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 749878a5a6f2802983e1ab37fffaa72190607ffb..c66fd247d90a9908e34dbc569ca9c676305cf981 100644 (file)
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -766,16 +766,18 @@ enum {
 #define TA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcamsg))
 /* tcamsg flags stored in attribute TCA_ROOT_FLAGS
  *
- * TCA_FLAG_LARGE_DUMP_ON user->kernel to request for larger than TCA_ACT_MAX_PRIO
- * actions in a dump. All dump responses will contain the number of actions
- * being dumped stored in for user app's consumption in TCA_ROOT_COUNT
+ * TCA_ACT_FLAG_LARGE_DUMP_ON user->kernel to request for larger than
+ * TCA_ACT_MAX_PRIO actions in a dump. All dump responses will contain the
+ * number of actions being dumped stored in for user app's consumption in
+ * TCA_ROOT_COUNT
  *
- * TCA_FLAG_TERSE_DUMP user->kernel to request terse (brief) dump that only
+ * TCA_ACT_FLAG_TERSE_DUMP user->kernel to request terse (brief) dump that only
  * includes essential action info (kind, index, etc.)
  *
  */
 #define TCA_FLAG_LARGE_DUMP_ON         (1 << 0)
-#define TCA_FLAG_TERSE_DUMP            (1 << 1)
+#define TCA_ACT_FLAG_LARGE_DUMP_ON     TCA_FLAG_LARGE_DUMP_ON
+#define TCA_ACT_FLAG_TERSE_DUMP                (1 << 1)
 
 /* New extended info filters for IFLA_EXT_MASK */
 #define RTEXT_FILTER_VF                (1 << 0)

diff --git a/include/uapi/linux/tls.h b/include/uapi/linux/tls.h
index 3b6754004466eaeab0935dfd62a1243a6f95755b..805cbce6ce3d60f90a5aa97d4608242ef996c92e 100644 (file)
--- a/include/uapi/linux/tls.h
+++ b/include/uapi/linux/tls.h
@@ -77,6 +77,13 @@
 #define TLS_CIPHER_AES_CCM_128_TAG_SIZE                16
 #define TLS_CIPHER_AES_CCM_128_REC_SEQ_SIZE            8
 
+#define TLS_CIPHER_CHACHA20_POLY1305                   54
+#define TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE           12
+#define TLS_CIPHER_CHACHA20_POLY1305_KEY_SIZE  32
+#define TLS_CIPHER_CHACHA20_POLY1305_SALT_SIZE         0
+#define TLS_CIPHER_CHACHA20_POLY1305_TAG_SIZE  16
+#define TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE      8
+
 #define TLS_SET_RECORD_TYPE    1
 #define TLS_GET_RECORD_TYPE    2
 
@@ -109,6 +116,14 @@ struct tls12_crypto_info_aes_ccm_128 {
        unsigned char rec_seq[TLS_CIPHER_AES_CCM_128_REC_SEQ_SIZE];
 };
 
+struct tls12_crypto_info_chacha20_poly1305 {
+       struct tls_crypto_info info;
+       unsigned char iv[TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE];
+       unsigned char key[TLS_CIPHER_CHACHA20_POLY1305_KEY_SIZE];
+       unsigned char salt[TLS_CIPHER_CHACHA20_POLY1305_SALT_SIZE];
+       unsigned char rec_seq[TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE];
+};
+
 enum {
        TLS_INFO_UNSPEC,
        TLS_INFO_VERSION,