Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ethtool for openSUSE:Factory checked
in at 2022-06-23 10:22:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ethtool (Old)
and /work/SRC/openSUSE:Factory/.ethtool.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ethtool"
Thu Jun 23 10:22:11 2022 rev:73 rq:984069 version:5.18
Changes:
--------
--- /work/SRC/openSUSE:Factory/ethtool/ethtool.changes 2022-04-13
21:03:56.596516175 +0200
+++ /work/SRC/openSUSE:Factory/.ethtool.new.1548/ethtool.changes
2022-06-23 10:22:14.447607666 +0200
@@ -1,0 +2,9 @@
+Mon Jun 13 23:07:06 UTC 2022 - Michal Kubecek <mkube...@suse.cz>
+
+- update to upstream release 5.18
+ * Feature: get/set cqe size (-g and -G)
+ * Fix: fix typo in man page
+ * Fix: fix help text alignment
+ * Fix: improve attribute label (--show-fec)
+
+-------------------------------------------------------------------
Old:
----
ethtool-5.17.tar.sign
ethtool-5.17.tar.xz
New:
----
ethtool-5.18.tar.sign
ethtool-5.18.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ethtool.spec ++++++
--- /var/tmp/diff_new_pack.BfrF3v/_old 2022-06-23 10:22:15.059608331 +0200
+++ /var/tmp/diff_new_pack.BfrF3v/_new 2022-06-23 10:22:15.067608340 +0200
@@ -17,7 +17,7 @@
Name: ethtool
-Version: 5.17
+Version: 5.18
Release: 0
Summary: Utility for examining and tuning Ethernet-based network
interfaces
License: GPL-2.0-only
++++++ ethtool-5.17.tar.xz -> ethtool-5.18.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.17/NEWS new/ethtool-5.18/NEWS
--- old/ethtool-5.17/NEWS 2022-04-04 00:22:51.000000000 +0200
+++ new/ethtool-5.18/NEWS 2022-06-14 00:54:43.000000000 +0200
@@ -1,3 +1,9 @@
+Version 5.18 - June 14, 2022
+ * Feature: get/set cqe size (-g and -G)
+ * Fix: fix typo in man page
+ * Fix: fix help text alignment
+ * Fix: improve attribute label (--show-fec)
+
Version 5.17 - April 4, 2022
* Feature: transceiver module power mode (--set-module)
* Feature: transceiver module extended state (--show-module)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.17/configure new/ethtool-5.18/configure
--- old/ethtool-5.17/configure 2022-04-04 00:25:57.000000000 +0200
+++ new/ethtool-5.18/configure 2022-06-14 00:56:18.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ethtool 5.17.
+# Generated by GNU Autoconf 2.69 for ethtool 5.18.
#
# Report bugs to <net...@vger.kernel.org>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='ethtool'
PACKAGE_TARNAME='ethtool'
-PACKAGE_VERSION='5.17'
-PACKAGE_STRING='ethtool 5.17'
+PACKAGE_VERSION='5.18'
+PACKAGE_STRING='ethtool 5.18'
PACKAGE_BUGREPORT='net...@vger.kernel.org'
PACKAGE_URL=''
@@ -1254,7 +1254,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ethtool 5.17 to adapt to many kinds of systems.
+\`configure' configures ethtool 5.18 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1320,7 +1320,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ethtool 5.17:";;
+ short | recursive ) echo "Configuration of ethtool 5.18:";;
esac
cat <<\_ACEOF
@@ -1430,7 +1430,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ethtool configure 5.17
+ethtool configure 5.18
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1677,7 +1677,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ethtool $as_me 5.17, which was
+It was created by ethtool $as_me 5.18, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2542,7 +2542,7 @@
# Define the identity of the package.
PACKAGE='ethtool'
- VERSION='5.17'
+ VERSION='5.18'
cat >>confdefs.h <<_ACEOF
@@ -5122,7 +5122,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ethtool $as_me 5.17, which was
+This file was extended by ethtool $as_me 5.18, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5188,7 +5188,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ethtool config.status 5.17
+ethtool config.status 5.18
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.17/configure.ac
new/ethtool-5.18/configure.ac
--- old/ethtool-5.17/configure.ac 2022-04-04 00:10:29.000000000 +0200
+++ new/ethtool-5.18/configure.ac 2022-06-14 00:51:11.000000000 +0200
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(ethtool, 5.17, net...@vger.kernel.org)
+AC_INIT(ethtool, 5.18, net...@vger.kernel.org)
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR([ethtool.c])
AM_INIT_AUTOMAKE([gnu subdir-objects])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.17/ethtool.8 new/ethtool-5.18/ethtool.8
--- old/ethtool-5.17/ethtool.8 2022-04-04 00:26:02.000000000 +0200
+++ new/ethtool-5.18/ethtool.8 2022-06-14 00:56:20.000000000 +0200
@@ -117,7 +117,7 @@
. hy \\n(HY
..
.
-.TH ETHTOOL 8 "April 2022" "Ethtool version 5.17"
+.TH ETHTOOL 8 "June 2022" "Ethtool version 5.18"
.SH NAME
ethtool \- query or control network driver and hardware settings
.
@@ -199,6 +199,7 @@
.BN rx\-jumbo
.BN tx
.BN rx\-buf\-len
+.BN cqe\-size
.HP
.B ethtool \-i|\-\-driver
.I devname
@@ -573,6 +574,9 @@
.TP
.BI rx\-buf\-len \ N
Changes the size of a buffer in the Rx ring.
+.TP
+.BI cqe\-size \ N
+Changes the size of completion queue event.
.RE
.TP
.B \-i \-\-driver
@@ -1426,7 +1430,7 @@
--coalesce.
.RE
.TP
-q.B \-\-cable\-test
+.B \-\-cable\-test
Perform a cable test and report the results. What results are returned depends
on the capabilities of the network interface. Typically open pairs and shorted
pairs can be reported, along with pairs being O.K. When a fault is detected
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.17/ethtool.8.in
new/ethtool-5.18/ethtool.8.in
--- old/ethtool-5.17/ethtool.8.in 2022-04-04 00:10:48.000000000 +0200
+++ new/ethtool-5.18/ethtool.8.in 2022-06-14 00:51:01.000000000 +0200
@@ -117,7 +117,7 @@
. hy \\n(HY
..
.
-.TH ETHTOOL 8 "April 2022" "Ethtool version @VERSION@"
+.TH ETHTOOL 8 "June 2022" "Ethtool version @VERSION@"
.SH NAME
ethtool \- query or control network driver and hardware settings
.
@@ -199,6 +199,7 @@
.BN rx\-jumbo
.BN tx
.BN rx\-buf\-len
+.BN cqe\-size
.HP
.B ethtool \-i|\-\-driver
.I devname
@@ -573,6 +574,9 @@
.TP
.BI rx\-buf\-len \ N
Changes the size of a buffer in the Rx ring.
+.TP
+.BI cqe\-size \ N
+Changes the size of completion queue event.
.RE
.TP
.B \-i \-\-driver
@@ -1426,7 +1430,7 @@
--coalesce.
.RE
.TP
-q.B \-\-cable\-test
+.B \-\-cable\-test
Perform a cable test and report the results. What results are returned depends
on the capabilities of the network interface. Typically open pairs and shorted
pairs can be reported, along with pairs being O.K. When a fault is detected
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.17/ethtool.c new/ethtool-5.18/ethtool.c
--- old/ethtool-5.17/ethtool.c 2022-04-04 00:08:42.000000000 +0200
+++ new/ethtool-5.18/ethtool.c 2022-06-14 00:49:00.000000000 +0200
@@ -5567,7 +5567,7 @@
}
fprintf(stdout, "FEC parameters for %s:\n", ctx->devname);
- fprintf(stdout, "Configured FEC encodings:");
+ fprintf(stdout, "Supported/Configured FEC encodings:");
dump_fec(feccmd.fec);
fprintf(stdout, "\n");
@@ -5732,7 +5732,8 @@
" [ rx-mini N ]\n"
" [ rx-jumbo N ]\n"
" [ tx N ]\n"
- " [ rx-buf-len N]\n"
+ " [ rx-buf-len N]\n"
+ " [ cqe-size N]\n"
},
{
.opts = "-k|--show-features|--show-offload",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.17/ethtool.spec
new/ethtool-5.18/ethtool.spec
--- old/ethtool-5.17/ethtool.spec 2022-04-04 00:26:02.000000000 +0200
+++ new/ethtool-5.18/ethtool.spec 2022-06-14 00:56:20.000000000 +0200
@@ -1,5 +1,5 @@
Name : ethtool
-Version : 5.17
+Version : 5.18
Release : 1
Group : Utilities
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.17/netlink/desc-ethtool.c
new/ethtool-5.18/netlink/desc-ethtool.c
--- old/ethtool-5.17/netlink/desc-ethtool.c 2022-01-19 00:46:20.000000000
+0100
+++ new/ethtool-5.18/netlink/desc-ethtool.c 2022-06-14 00:47:07.000000000
+0200
@@ -128,6 +128,12 @@
NLATTR_DESC_NESTED(ETHTOOL_A_PRIVFLAGS_FLAGS, bitset),
};
+static const char *__rings_tcp_data_split_names[] = {
+ [ETHTOOL_TCP_DATA_SPLIT_UNKNOWN] =
"ETHTOOL_TCP_DATA_SPLIT_UNKNOWN",
+ [ETHTOOL_TCP_DATA_SPLIT_DISABLED] =
"ETHTOOL_TCP_DATA_SPLIT_DISABLED",
+ [ETHTOOL_TCP_DATA_SPLIT_ENABLED] =
"ETHTOOL_TCP_DATA_SPLIT_ENABLED",
+};
+
static const struct pretty_nla_desc __rings_desc[] = {
NLATTR_DESC_INVALID(ETHTOOL_A_RINGS_UNSPEC),
NLATTR_DESC_NESTED(ETHTOOL_A_RINGS_HEADER, header),
@@ -139,6 +145,9 @@
NLATTR_DESC_U32(ETHTOOL_A_RINGS_RX_MINI),
NLATTR_DESC_U32(ETHTOOL_A_RINGS_RX_JUMBO),
NLATTR_DESC_U32(ETHTOOL_A_RINGS_TX),
+ NLATTR_DESC_U32(ETHTOOL_A_RINGS_RX_BUF_LEN),
+ NLATTR_DESC_U8_ENUM(ETHTOOL_A_RINGS_TCP_DATA_SPLIT,
rings_tcp_data_split),
+ NLATTR_DESC_U32(ETHTOOL_A_RINGS_CQE_SIZE),
};
static const struct pretty_nla_desc __channels_desc[] = {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.17/netlink/fec.c
new/ethtool-5.18/netlink/fec.c
--- old/ethtool-5.17/netlink/fec.c 2021-05-20 17:28:18.000000000 +0200
+++ new/ethtool-5.18/netlink/fec.c 2022-06-14 00:49:00.000000000 +0200
@@ -153,7 +153,7 @@
print_string(PRINT_ANY, "ifname", "FEC parameters for %s:\n",
nlctx->devname);
- open_json_array("config", "Configured FEC encodings:");
+ open_json_array("config", "Supported/Configured FEC encodings:");
fa = tb[ETHTOOL_A_FEC_AUTO] && mnl_attr_get_u8(tb[ETHTOOL_A_FEC_AUTO]);
if (fa)
print_string(PRINT_ANY, NULL, " %s", "Auto");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.17/netlink/prettymsg.c
new/ethtool-5.18/netlink/prettymsg.c
--- old/ethtool-5.17/netlink/prettymsg.c 2020-10-21 11:41:59.000000000
+0200
+++ new/ethtool-5.18/netlink/prettymsg.c 2022-06-14 00:47:03.000000000
+0200
@@ -147,8 +147,14 @@
case NLA_BOOL:
printf("%s", mnl_attr_get_u8(attr) ? "on" : "off");
break;
+ case NLA_U8_ENUM:
case NLA_U32_ENUM: {
- uint32_t val = mnl_attr_get_u32(attr);
+ uint32_t val;
+
+ if (adesc->format == NLA_U8_ENUM)
+ val = mnl_attr_get_u8(attr);
+ else
+ val = mnl_attr_get_u32(attr);
if (adesc && val < adesc->n_names && adesc->names[val])
printf("%s", adesc->names[val]);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.17/netlink/prettymsg.h
new/ethtool-5.18/netlink/prettymsg.h
--- old/ethtool-5.17/netlink/prettymsg.h 2020-10-21 11:41:59.000000000
+0200
+++ new/ethtool-5.18/netlink/prettymsg.h 2022-06-14 00:47:03.000000000
+0200
@@ -31,6 +31,7 @@
NLA_BOOL,
NLA_NESTED,
NLA_ARRAY,
+ NLA_U8_ENUM,
NLA_U32_ENUM,
};
@@ -94,6 +95,13 @@
.children = __ ## _children_desc ## _desc, \
.n_children = 1, \
}
+#define NLATTR_DESC_U8_ENUM(_name, _names_table) \
+ [_name] = { \
+ .format = NLA_U8_ENUM, \
+ .name = #_name, \
+ .names = __ ## _names_table ## _names, \
+ .n_children = ARRAY_SIZE(__ ## _names_table ## _names), \
+ }
#define NLATTR_DESC_U32_ENUM(_name, _names_table) \
[_name] = { \
.format = NLA_U32_ENUM, \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.17/netlink/rings.c
new/ethtool-5.18/netlink/rings.c
--- old/ethtool-5.17/netlink/rings.c 2022-01-19 00:46:20.000000000 +0100
+++ new/ethtool-5.18/netlink/rings.c 2022-06-14 00:47:00.000000000 +0200
@@ -47,6 +47,7 @@
show_u32(tb[ETHTOOL_A_RINGS_RX_JUMBO], "RX Jumbo:\t");
show_u32(tb[ETHTOOL_A_RINGS_TX], "TX:\t\t");
show_u32(tb[ETHTOOL_A_RINGS_RX_BUF_LEN], "RX Buf Len:\t\t");
+ show_u32(tb[ETHTOOL_A_RINGS_CQE_SIZE], "CQE Size:\t\t");
return MNL_CB_OK;
}
@@ -105,6 +106,12 @@
.handler = nl_parse_direct_u32,
.min_argc = 1,
},
+ {
+ .arg = "cqe-size",
+ .type = ETHTOOL_A_RINGS_CQE_SIZE,
+ .handler = nl_parse_direct_u32,
+ .min_argc = 1,
+ },
{}
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.17/uapi/linux/ethtool_netlink.h
new/ethtool-5.18/uapi/linux/ethtool_netlink.h
--- old/ethtool-5.17/uapi/linux/ethtool_netlink.h 2022-01-19
00:46:20.000000000 +0100
+++ new/ethtool-5.18/uapi/linux/ethtool_netlink.h 2022-06-13
23:52:49.000000000 +0200
@@ -319,6 +319,12 @@
/* RINGS */
enum {
+ ETHTOOL_TCP_DATA_SPLIT_UNKNOWN = 0,
+ ETHTOOL_TCP_DATA_SPLIT_DISABLED,
+ ETHTOOL_TCP_DATA_SPLIT_ENABLED,
+};
+
+enum {
ETHTOOL_A_RINGS_UNSPEC,
ETHTOOL_A_RINGS_HEADER, /* nest - _A_HEADER_* */
ETHTOOL_A_RINGS_RX_MAX, /* u32 */
@@ -330,6 +336,8 @@
ETHTOOL_A_RINGS_RX_JUMBO, /* u32 */
ETHTOOL_A_RINGS_TX, /* u32 */
ETHTOOL_A_RINGS_RX_BUF_LEN, /* u32 */
+ ETHTOOL_A_RINGS_TCP_DATA_SPLIT, /* u8 */
+ ETHTOOL_A_RINGS_CQE_SIZE, /* u32 */
/* add new constants above here */
__ETHTOOL_A_RINGS_CNT,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.17/uapi/linux/if_link.h
new/ethtool-5.18/uapi/linux/if_link.h
--- old/ethtool-5.17/uapi/linux/if_link.h 2022-01-19 00:46:20.000000000
+0100
+++ new/ethtool-5.18/uapi/linux/if_link.h 2022-06-13 23:52:49.000000000
+0200
@@ -245,6 +245,21 @@
__u64 rx_nohandler;
};
+/* Subset of link stats useful for in-HW collection. Meaning of the fields is
as
+ * for struct rtnl_link_stats64.
+ */
+struct rtnl_hw_stats64 {
+ __u64 rx_packets;
+ __u64 tx_packets;
+ __u64 rx_bytes;
+ __u64 tx_bytes;
+ __u64 rx_errors;
+ __u64 tx_errors;
+ __u64 rx_dropped;
+ __u64 tx_dropped;
+ __u64 multicast;
+};
+
/* The struct should be in sync with struct ifmap */
struct rtnl_link_ifmap {
__u64 mem_start;
@@ -347,6 +362,7 @@
*/
IFLA_PARENT_DEV_NAME,
IFLA_PARENT_DEV_BUS_NAME,
+ IFLA_GRO_MAX_SIZE,
__IFLA_MAX
};
@@ -534,6 +550,7 @@
IFLA_BRPORT_MRP_IN_OPEN,
IFLA_BRPORT_MCAST_EHT_HOSTS_LIMIT,
IFLA_BRPORT_MCAST_EHT_HOSTS_CNT,
+ IFLA_BRPORT_LOCKED,
__IFLA_BRPORT_MAX
};
#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -709,7 +726,55 @@
#define IPVLAN_F_PRIVATE 0x01
#define IPVLAN_F_VEPA 0x02
+/* Tunnel RTM header */
+struct tunnel_msg {
+ __u8 family;
+ __u8 flags;
+ __u16 reserved2;
+ __u32 ifindex;
+};
+
/* VXLAN section */
+
+/* include statistics in the dump */
+#define TUNNEL_MSG_FLAG_STATS 0x01
+
+#define TUNNEL_MSG_VALID_USER_FLAGS TUNNEL_MSG_FLAG_STATS
+
+/* Embedded inside VXLAN_VNIFILTER_ENTRY_STATS */
+enum {
+ VNIFILTER_ENTRY_STATS_UNSPEC,
+ VNIFILTER_ENTRY_STATS_RX_BYTES,
+ VNIFILTER_ENTRY_STATS_RX_PKTS,
+ VNIFILTER_ENTRY_STATS_RX_DROPS,
+ VNIFILTER_ENTRY_STATS_RX_ERRORS,
+ VNIFILTER_ENTRY_STATS_TX_BYTES,
+ VNIFILTER_ENTRY_STATS_TX_PKTS,
+ VNIFILTER_ENTRY_STATS_TX_DROPS,
+ VNIFILTER_ENTRY_STATS_TX_ERRORS,
+ VNIFILTER_ENTRY_STATS_PAD,
+ __VNIFILTER_ENTRY_STATS_MAX
+};
+#define VNIFILTER_ENTRY_STATS_MAX (__VNIFILTER_ENTRY_STATS_MAX - 1)
+
+enum {
+ VXLAN_VNIFILTER_ENTRY_UNSPEC,
+ VXLAN_VNIFILTER_ENTRY_START,
+ VXLAN_VNIFILTER_ENTRY_END,
+ VXLAN_VNIFILTER_ENTRY_GROUP,
+ VXLAN_VNIFILTER_ENTRY_GROUP6,
+ VXLAN_VNIFILTER_ENTRY_STATS,
+ __VXLAN_VNIFILTER_ENTRY_MAX
+};
+#define VXLAN_VNIFILTER_ENTRY_MAX (__VXLAN_VNIFILTER_ENTRY_MAX - 1)
+
+enum {
+ VXLAN_VNIFILTER_UNSPEC,
+ VXLAN_VNIFILTER_ENTRY,
+ __VXLAN_VNIFILTER_MAX
+};
+#define VXLAN_VNIFILTER_MAX (__VXLAN_VNIFILTER_MAX - 1)
+
enum {
IFLA_VXLAN_UNSPEC,
IFLA_VXLAN_ID,
@@ -741,6 +806,7 @@
IFLA_VXLAN_GPE,
IFLA_VXLAN_TTL_INHERIT,
IFLA_VXLAN_DF,
+ IFLA_VXLAN_VNIFILTER, /* only applicable with COLLECT_METADATA mode */
__IFLA_VXLAN_MAX
};
#define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)
@@ -774,6 +840,7 @@
IFLA_GENEVE_LABEL,
IFLA_GENEVE_TTL_INHERIT,
IFLA_GENEVE_DF,
+ IFLA_GENEVE_INNER_PROTO_INHERIT,
__IFLA_GENEVE_MAX
};
#define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)
@@ -819,6 +886,8 @@
IFLA_GTP_FD1,
IFLA_GTP_PDP_HASHSIZE,
IFLA_GTP_ROLE,
+ IFLA_GTP_CREATE_SOCKETS,
+ IFLA_GTP_RESTART_COUNT,
__IFLA_GTP_MAX,
};
#define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1)
@@ -857,6 +926,7 @@
IFLA_BOND_PEER_NOTIF_DELAY,
IFLA_BOND_AD_LACP_ACTIVE,
IFLA_BOND_MISSED_MAX,
+ IFLA_BOND_NS_IP6_TARGET,
__IFLA_BOND_MAX,
};
@@ -1153,6 +1223,17 @@
#define IFLA_STATS_FILTER_BIT(ATTR) (1 << (ATTR - 1))
+enum {
+ IFLA_STATS_GETSET_UNSPEC,
+ IFLA_STATS_GET_FILTERS, /* Nest of IFLA_STATS_LINK_xxx, each a u32 with
+ * a filter mask for the corresponding group.
+ */
+ IFLA_STATS_SET_OFFLOAD_XSTATS_L3_STATS, /* 0 or 1 as u8 */
+ __IFLA_STATS_GETSET_MAX,
+};
+
+#define IFLA_STATS_GETSET_MAX (__IFLA_STATS_GETSET_MAX - 1)
+
/* These are embedded into IFLA_STATS_LINK_XSTATS:
* [IFLA_STATS_LINK_XSTATS]
* -> [LINK_XSTATS_TYPE_xxx]
@@ -1170,10 +1251,21 @@
enum {
IFLA_OFFLOAD_XSTATS_UNSPEC,
IFLA_OFFLOAD_XSTATS_CPU_HIT, /* struct rtnl_link_stats64 */
+ IFLA_OFFLOAD_XSTATS_HW_S_INFO, /* HW stats info. A nest */
+ IFLA_OFFLOAD_XSTATS_L3_STATS, /* struct rtnl_hw_stats64 */
__IFLA_OFFLOAD_XSTATS_MAX
};
#define IFLA_OFFLOAD_XSTATS_MAX (__IFLA_OFFLOAD_XSTATS_MAX - 1)
+enum {
+ IFLA_OFFLOAD_XSTATS_HW_S_INFO_UNSPEC,
+ IFLA_OFFLOAD_XSTATS_HW_S_INFO_REQUEST, /* u8 */
+ IFLA_OFFLOAD_XSTATS_HW_S_INFO_USED, /* u8 */
+ __IFLA_OFFLOAD_XSTATS_HW_S_INFO_MAX,
+};
+#define IFLA_OFFLOAD_XSTATS_HW_S_INFO_MAX \
+ (__IFLA_OFFLOAD_XSTATS_HW_S_INFO_MAX - 1)
+
/* XDP section */
#define XDP_FLAGS_UPDATE_IF_NOEXIST (1U << 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.17/uapi/linux/net_tstamp.h
new/ethtool-5.18/uapi/linux/net_tstamp.h
--- old/ethtool-5.17/uapi/linux/net_tstamp.h 2021-12-17 17:43:58.000000000
+0100
+++ new/ethtool-5.18/uapi/linux/net_tstamp.h 2022-06-13 23:50:26.000000000
+0200
@@ -62,7 +62,7 @@
/**
* struct hwtstamp_config - %SIOCGHWTSTAMP and %SIOCSHWTSTAMP parameter
*
- * @flags: no flags defined right now, must be zero for %SIOCSHWTSTAMP
+ * @flags: one of HWTSTAMP_FLAG_*
* @tx_type: one of HWTSTAMP_TX_*
* @rx_filter: one of HWTSTAMP_FILTER_*
*
@@ -78,6 +78,21 @@
int rx_filter;
};
+/* possible values for hwtstamp_config->flags */
+enum hwtstamp_flags {
+ /*
+ * With this flag, the user could get bond active interface's
+ * PHC index. Note this PHC index is not stable as when there
+ * is a failover, the bond active interface will be changed, so
+ * will be the PHC index.
+ */
+ HWTSTAMP_FLAG_BONDED_PHC_INDEX = (1<<0),
+#define HWTSTAMP_FLAG_BONDED_PHC_INDEX HWTSTAMP_FLAG_BONDED_PHC_INDEX
+
+ HWTSTAMP_FLAG_LAST = HWTSTAMP_FLAG_BONDED_PHC_INDEX,
+ HWTSTAMP_FLAG_MASK = (HWTSTAMP_FLAG_LAST - 1) | HWTSTAMP_FLAG_LAST
+};
+
/* possible values for hwtstamp_config->tx_type */
enum hwtstamp_tx_types {
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.17/uapi/linux/rtnetlink.h
new/ethtool-5.18/uapi/linux/rtnetlink.h
--- old/ethtool-5.17/uapi/linux/rtnetlink.h 2021-12-17 17:43:58.000000000
+0100
+++ new/ethtool-5.18/uapi/linux/rtnetlink.h 2022-06-13 23:50:26.000000000
+0200
@@ -146,6 +146,8 @@
#define RTM_NEWSTATS RTM_NEWSTATS
RTM_GETSTATS = 94,
#define RTM_GETSTATS RTM_GETSTATS
+ RTM_SETSTATS,
+#define RTM_SETSTATS RTM_SETSTATS
RTM_NEWCACHEREPORT = 96,
#define RTM_NEWCACHEREPORT RTM_NEWCACHEREPORT
@@ -185,6 +187,13 @@
RTM_GETNEXTHOPBUCKET,
#define RTM_GETNEXTHOPBUCKET RTM_GETNEXTHOPBUCKET
+ RTM_NEWTUNNEL = 120,
+#define RTM_NEWTUNNEL RTM_NEWTUNNEL
+ RTM_DELTUNNEL,
+#define RTM_DELTUNNEL RTM_DELTUNNEL
+ RTM_GETTUNNEL,
+#define RTM_GETTUNNEL RTM_GETTUNNEL
+
__RTM_MAX,
#define RTM_MAX (((__RTM_MAX + 3) & ~3) - 1)
};
@@ -752,6 +761,12 @@
#define RTNLGRP_NEXTHOP RTNLGRP_NEXTHOP
RTNLGRP_BRVLAN,
#define RTNLGRP_BRVLAN RTNLGRP_BRVLAN
+ RTNLGRP_MCTP_IFADDR,
+#define RTNLGRP_MCTP_IFADDR RTNLGRP_MCTP_IFADDR
+ RTNLGRP_TUNNEL,
+#define RTNLGRP_TUNNEL RTNLGRP_TUNNEL
+ RTNLGRP_STATS,
+#define RTNLGRP_STATS RTNLGRP_STATS
__RTNLGRP_MAX
};
#define RTNLGRP_MAX (__RTNLGRP_MAX - 1)
@@ -800,6 +815,7 @@
#define RTEXT_FILTER_MRP (1 << 4)
#define RTEXT_FILTER_CFM_CONFIG (1 << 5)
#define RTEXT_FILTER_CFM_STATUS (1 << 6)
+#define RTEXT_FILTER_MST (1 << 7)
/* End of information exported to user level */
