]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Update kernel headers
authorDavid Ahern <dsahern@kernel.org>
Sun, 22 Jan 2023 17:56:46 +0000 (10:56 -0700)
committerDavid Ahern <dsahern@kernel.org>
Sun, 22 Jan 2023 17:56:46 +0000 (10:56 -0700)
Update kernel headers to commit
    a7b87d2a31dc ("Merge branch 'mlxsw-add-support-of-latency-tlv'")

Signed-off-by: David Ahern <dsahern@kernel.org>
include/uapi/linux/bpf.h
include/uapi/linux/dcbnl.h
include/uapi/linux/ioam6.h
include/uapi/linux/rpl.h
include/uapi/linux/rtnetlink.h

index a667908d20809d132bb5258baa07407adfd1a3b2..985e9e7300e03db649b91ccc15b58a8947d90fe6 100644 (file)
@@ -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. */
index 99047223ab2661620563a9b95c76c7ede95bb8d9..7e15214aa5dd4fa90eb42fdcbf115314593e3e52 100644 (file)
@@ -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)
index d1653a31e90b94c616957d69ef8d69b1893d43b8..e646011ce1383bc9d93148db9d43da1bc01de1cc 100644 (file)
@@ -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 */
index 72d60e096774c083979a0a6dbf5fa9ead2c98b2b..42580b39b3ccd0f629e3529bd706fbe2b5c62c79 100644 (file)
@@ -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));
 
index f4a540c01b15609444d7c3ce8b67366e4ddee93f..217b25b963f54b20553c0c7b412649ca87e84997 100644 (file)
@@ -635,6 +635,7 @@ enum {
        TCA_INGRESS_BLOCK,
        TCA_EGRESS_BLOCK,
        TCA_DUMP_FLAGS,
+       TCA_EXT_WARN_MSG,
        __TCA_MAX
 };