Update kernel headers

Update kernel headers to commit:
    940f13821528 ("Merge branch 'dpaa2-eth-misc-cleanup'")

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

diff --git a/include/uapi/linux/btf.h b/include/uapi/linux/btf.h
index 8ef8001de476c8a650137c3c6644c76c5aa38054..d28dd89aeba4f68b0448d9c7c49ef7ded2dff325 100644 (file)
--- a/include/uapi/linux/btf.h
+++ b/include/uapi/linux/btf.h
@@ -22,9 +22,9 @@ struct btf_header {
 };
 
 /* Max # of type identifier */
-#define BTF_MAX_TYPE   0x0000ffff
+#define BTF_MAX_TYPE   0x000fffff
 /* Max offset into the string section */
-#define BTF_MAX_NAME_OFFSET    0x0000ffff
+#define BTF_MAX_NAME_OFFSET    0x00ffffff
 /* Max # of struct/union/enum members or func args */
 #define BTF_MAX_VLEN   0xffff
 

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index 79e1405db67cc76d6a21bafd37bbdfa199c50773..ab09b3b83675eddafabbf28f1febbf29e35085b3 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -421,6 +421,10 @@ enum devlink_attr {
 
        DEVLINK_ATTR_RELOAD_FAILED,                     /* u8 0 or 1 */
 
+       DEVLINK_ATTR_NETNS_FD,                  /* u32 */
+       DEVLINK_ATTR_NETNS_PID,                 /* u32 */
+       DEVLINK_ATTR_NETNS_ID,                  /* u32 */
+
        /* add new attributes above here, update the policy in devlink.c */
 
        __DEVLINK_ATTR_MAX,

diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h
index 495cdd23244283716d6892214c361ba3d3501f20..cf27ea4c44c932ac8b9ae32744643932a4f9210f 100644 (file)
--- a/include/uapi/linux/if.h
+++ b/include/uapi/linux/if.h
@@ -31,6 +31,7 @@
 #define        IFNAMSIZ        16
 #endif /* __UAPI_DEF_IF_IFNAMSIZ */
 #define        IFALIASZ        256
+#define        ALTIFNAMSIZ     128
 #include <linux/hdlc/ioctl.h>
 
 /* For glibc compatibility. An empty enum does not compile. */

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index d36919fb4024a3c1e1f1d1414fd5d1b3d0d2229b..1c49f436424db703f69f760b4714d263f8199782 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -167,6 +167,8 @@ enum {
        IFLA_NEW_IFINDEX,
        IFLA_MIN_MTU,
        IFLA_MAX_MTU,
+       IFLA_PROP_LIST,
+       IFLA_ALT_IFNAME, /* Alternative ifname */
        __IFLA_MAX
 };
 

diff --git a/include/uapi/linux/netfilter_ipv4/ip_tables.h b/include/uapi/linux/netfilter_ipv4/ip_tables.h
index 409cff71bd238908ae4b53b9fe2efee57e01bf63..e1ce5b3a2ae95509cb4511848700df680a42ca5d 100644 (file)
--- a/include/uapi/linux/netfilter_ipv4/ip_tables.h
+++ b/include/uapi/linux/netfilter_ipv4/ip_tables.h
@@ -220,7 +220,7 @@ struct ipt_get_entries {
 static __inline__ struct xt_entry_target *
 ipt_get_target(struct ipt_entry *e)
 {
-       return (void *)e + e->target_offset;
+       return (struct xt_entry_target *)((char *)e + e->target_offset);
 }
 
 /*

diff --git a/include/uapi/linux/netfilter_ipv6/ip6_tables.h b/include/uapi/linux/netfilter_ipv6/ip6_tables.h
index 7ae314ba260f3acd14af29f9710a1e733b0f3ffa..7bbead8c7f74b5e295e0f0f77421dc8a7efc9f54 100644 (file)
--- a/include/uapi/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6_tables.h
@@ -260,7 +260,7 @@ struct ip6t_get_entries {
 static __inline__ struct xt_entry_target *
 ip6t_get_target(struct ip6t_entry *e)
 {
-       return (void *)e + e->target_offset;
+       return (struct xt_entry_target *)((char *)e + e->target_offset);
 }
 
 /*

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 358e83ee134d2aa64f9d9ba86c5f618d32e9dc0f..4b93791cdbd42f304e6f1811cba655e54c9f948d 100644 (file)
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -164,6 +164,13 @@ enum {
        RTM_GETNEXTHOP,
 #define RTM_GETNEXTHOP RTM_GETNEXTHOP
 
+       RTM_NEWLINKPROP = 108,
+#define RTM_NEWLINKPROP        RTM_NEWLINKPROP
+       RTM_DELLINKPROP,
+#define RTM_DELLINKPROP        RTM_DELLINKPROP
+       RTM_GETLINKPROP,
+#define RTM_GETLINKPROP        RTM_GETLINKPROP
+
        __RTM_MAX,
 #define RTM_MAX                (((__RTM_MAX + 3) & ~3) - 1)
 };

diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h
index 549a31c29f7d4ebbc3a861244e9757c3ebbc2d0d..7eee233e78d2740e15b2abe445f7b6d40d217846 100644 (file)
--- a/include/uapi/linux/snmp.h
+++ b/include/uapi/linux/snmp.h
@@ -323,4 +323,21 @@ enum
        __LINUX_MIB_XFRMMAX
 };
 
+/* linux TLS mib definitions */
+enum
+{
+       LINUX_MIB_TLSNUM = 0,
+       LINUX_MIB_TLSCURRTXSW,                  /* TlsCurrTxSw */
+       LINUX_MIB_TLSCURRRXSW,                  /* TlsCurrRxSw */
+       LINUX_MIB_TLSCURRTXDEVICE,              /* TlsCurrTxDevice */
+       LINUX_MIB_TLSCURRRXDEVICE,              /* TlsCurrRxDevice */
+       LINUX_MIB_TLSTXSW,                      /* TlsTxSw */
+       LINUX_MIB_TLSRXSW,                      /* TlsRxSw */
+       LINUX_MIB_TLSTXDEVICE,                  /* TlsTxDevice */
+       LINUX_MIB_TLSRXDEVICE,                  /* TlsRxDevice */
+       LINUX_MIB_TLSDECRYPTERROR,              /* TlsDecryptError */
+       LINUX_MIB_TLSRXDEVICERESYNC,            /* TlsRxDeviceResync */
+       __LINUX_MIB_TLSMAX
+};
+
 #endif /* _LINUX_SNMP_H */