matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update kernel headers 

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

Signed-off-by: David Ahern <dsahern@kernel.org>
This commit is contained in:
David Ahern 2019-10-07 20:43:13 +00:00
parent 6284236237
commit 9dcd8788fe
8 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/uapi/linux/btf.h
View File

@ -22,9 +22,9 @@ struct btf_header {
}; };
/* Max # of type identifier */ /* Max # of type identifier */
#define BTF_MAX_TYPE 0x0000ffff #define BTF_MAX_TYPE 0x000fffff
/* Max offset into the string section */ /* 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 */ /* Max # of struct/union/enum members or func args */
#define BTF_MAX_VLEN 0xffff #define BTF_MAX_VLEN 0xffff

4
include/uapi/linux/devlink.h
View File

@ -421,6 +421,10 @@ enum devlink_attr {
DEVLINK_ATTR_RELOAD_FAILED, /* u8 0 or 1 */ 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 */ /* add new attributes above here, update the policy in devlink.c */
__DEVLINK_ATTR_MAX, __DEVLINK_ATTR_MAX,

1
include/uapi/linux/if.h
View File

@ -31,6 +31,7 @@
#define IFNAMSIZ 16 #define IFNAMSIZ 16
#endif /* __UAPI_DEF_IF_IFNAMSIZ */ #endif /* __UAPI_DEF_IF_IFNAMSIZ */
#define IFALIASZ 256 #define IFALIASZ 256
#define ALTIFNAMSIZ 128
#include <linux/hdlc/ioctl.h> #include <linux/hdlc/ioctl.h>
/* For glibc compatibility. An empty enum does not compile. */ /* For glibc compatibility. An empty enum does not compile. */

2
include/uapi/linux/if_link.h
View File

@ -167,6 +167,8 @@ enum {
IFLA_NEW_IFINDEX, IFLA_NEW_IFINDEX,
IFLA_MIN_MTU, IFLA_MIN_MTU,
IFLA_MAX_MTU, IFLA_MAX_MTU,
IFLA_PROP_LIST,
IFLA_ALT_IFNAME, /* Alternative ifname */
__IFLA_MAX __IFLA_MAX
}; };

2
include/uapi/linux/netfilter_ipv4/ip_tables.h
View File

@ -220,7 +220,7 @@ struct ipt_get_entries {
static __inline__ struct xt_entry_target * static __inline__ struct xt_entry_target *
ipt_get_target(struct ipt_entry *e) ipt_get_target(struct ipt_entry *e)
{ {
return (void *)e + e->target_offset; return (struct xt_entry_target *)((char *)e + e->target_offset);
} }
/* /*

2
include/uapi/linux/netfilter_ipv6/ip6_tables.h
View File

@ -260,7 +260,7 @@ struct ip6t_get_entries {
static __inline__ struct xt_entry_target * static __inline__ struct xt_entry_target *
ip6t_get_target(struct ip6t_entry *e) ip6t_get_target(struct ip6t_entry *e)
{ {
return (void *)e + e->target_offset; return (struct xt_entry_target *)((char *)e + e->target_offset);
} }
/* /*

7
include/uapi/linux/rtnetlink.h
View File

@ -164,6 +164,13 @@ enum {
RTM_GETNEXTHOP, RTM_GETNEXTHOP,
#define RTM_GETNEXTHOP 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, __RTM_MAX,
#define RTM_MAX (((__RTM_MAX + 3) & ~3) - 1) #define RTM_MAX (((__RTM_MAX + 3) & ~3) - 1)
}; };

17
include/uapi/linux/snmp.h
View File

@ -323,4 +323,21 @@ enum
__LINUX_MIB_XFRMMAX __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 */ #endif /* _LINUX_SNMP_H */