diff options
author | David Ahern <dsahern@kernel.org> | 2023-01-22 10:56:46 -0700 |
---|---|---|
committer | David Ahern <dsahern@kernel.org> | 2023-01-22 10:56:46 -0700 |
commit | 970884766f727d94dd2f375182e3ba6e7ce75a95 (patch) | |
tree | d7fb1caeaad14b9b65fc2bc689be887a32a61d10 | |
parent | b5d5da47aa42f3b989983f2ae9a6b038d5af9746 (diff) | |
download | iproute2-970884766f727d94dd2f375182e3ba6e7ce75a95.tar.gz |
Update kernel headers
Update kernel headers to commit
a7b87d2a31dc ("Merge branch 'mlxsw-add-support-of-latency-tlv'")
Signed-off-by: David Ahern <dsahern@kernel.org>
-rw-r--r-- | include/uapi/linux/bpf.h | 4 | ||||
-rw-r--r-- | include/uapi/linux/dcbnl.h | 2 | ||||
-rw-r--r-- | include/uapi/linux/ioam6.h | 2 | ||||
-rw-r--r-- | include/uapi/linux/rpl.h | 4 | ||||
-rw-r--r-- | include/uapi/linux/rtnetlink.h | 1 |
5 files changed, 10 insertions, 3 deletions
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index a667908d2..985e9e730 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -2001,6 +2001,9 @@ union bpf_attr { * sending the packet. This flag was added for GRE * encapsulation, but might be used with other protocols * as well in the future. + * **BPF_F_NO_TUNNEL_KEY** + * Add a flag to tunnel metadata indicating that no tunnel + * key should be set in the resulting tunnel header. * * Here is a typical usage on the transmit path: * @@ -5764,6 +5767,7 @@ enum { BPF_F_ZERO_CSUM_TX = (1ULL << 1), BPF_F_DONT_FRAGMENT = (1ULL << 2), BPF_F_SEQ_NUMBER = (1ULL << 3), + BPF_F_NO_TUNNEL_KEY = (1ULL << 4), }; /* BPF_FUNC_skb_get_tunnel_key flags. */ diff --git a/include/uapi/linux/dcbnl.h b/include/uapi/linux/dcbnl.h index 99047223a..7e15214aa 100644 --- a/include/uapi/linux/dcbnl.h +++ b/include/uapi/linux/dcbnl.h @@ -411,6 +411,7 @@ enum dcbnl_attrs { * @DCB_ATTR_IEEE_PEER_PFC: peer PFC configuration - get only * @DCB_ATTR_IEEE_PEER_APP: peer APP tlv - get only * @DCB_ATTR_DCB_APP_TRUST_TABLE: selector trust table + * @DCB_ATTR_DCB_REWR_TABLE: rewrite configuration */ enum ieee_attrs { DCB_ATTR_IEEE_UNSPEC, @@ -425,6 +426,7 @@ enum ieee_attrs { DCB_ATTR_IEEE_QCN_STATS, DCB_ATTR_DCB_BUFFER, DCB_ATTR_DCB_APP_TRUST_TABLE, + DCB_ATTR_DCB_REWR_TABLE, __DCB_ATTR_IEEE_MAX }; #define DCB_ATTR_IEEE_MAX (__DCB_ATTR_IEEE_MAX - 1) diff --git a/include/uapi/linux/ioam6.h b/include/uapi/linux/ioam6.h index d1653a31e..e646011ce 100644 --- a/include/uapi/linux/ioam6.h +++ b/include/uapi/linux/ioam6.h @@ -127,7 +127,7 @@ struct ioam6_trace_hdr { #endif #define IOAM6_TRACE_DATA_SIZE_MAX 244 - __u8 data[0]; + __u8 data[]; } __attribute__((packed)); #endif /* _LINUX_IOAM6_H */ diff --git a/include/uapi/linux/rpl.h b/include/uapi/linux/rpl.h index 72d60e096..42580b39b 100644 --- a/include/uapi/linux/rpl.h +++ b/include/uapi/linux/rpl.h @@ -37,8 +37,8 @@ struct ipv6_rpl_sr_hdr { #endif union { - struct in6_addr addr[0]; - __u8 data[0]; + __DECLARE_FLEX_ARRAY(struct in6_addr, addr); + __DECLARE_FLEX_ARRAY(__u8, data); } segments; } __attribute__((packed)); diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h index f4a540c01..217b25b96 100644 --- a/include/uapi/linux/rtnetlink.h +++ b/include/uapi/linux/rtnetlink.h @@ -635,6 +635,7 @@ enum { TCA_INGRESS_BLOCK, TCA_EGRESS_BLOCK, TCA_DUMP_FLAGS, + TCA_EXT_WARN_MSG, __TCA_MAX }; |