Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ethtool for openSUSE:Factory checked in at 2021-11-12 15:59:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ethtool (Old) and /work/SRC/openSUSE:Factory/.ethtool.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ethtool" Fri Nov 12 15:59:06 2021 rev:70 rq:930648 version:5.15 Changes: -------- --- /work/SRC/openSUSE:Factory/ethtool/ethtool.changes 2021-09-20 23:32:12.607103673 +0200 +++ /work/SRC/openSUSE:Factory/.ethtool.new.1890/ethtool.changes 2021-11-12 15:59:19.262566488 +0100 @@ -1,0 +2,9 @@ +Tue Nov 9 20:24:51 UTC 2021 - Michal Kubecek <[email protected]> + +- update to upstream release 5.15 + * Feature: new extended link substates for bad signal (no arg) + * Feature: coalesce cqe mode attributes (-c and -C) + * Fix: multiple fixes of EEPROM module data parsing (-m) + * Fix: fix condition to display MDI-X info (no arg) + +------------------------------------------------------------------- Old: ---- ethtool-5.14.tar.sign ethtool-5.14.tar.xz New: ---- ethtool-5.15.tar.sign ethtool-5.15.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ethtool.spec ++++++ --- /var/tmp/diff_new_pack.TNQKc2/_old 2021-11-12 15:59:19.970566816 +0100 +++ /var/tmp/diff_new_pack.TNQKc2/_new 2021-11-12 15:59:19.974566818 +0100 @@ -17,7 +17,7 @@ Name: ethtool -Version: 5.14 +Version: 5.15 Release: 0 Summary: Utility for examining and tuning Ethernet-based network interfaces License: GPL-2.0-only ++++++ ethtool-5.14.tar.xz -> ethtool-5.15.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-5.14/NEWS new/ethtool-5.15/NEWS --- old/ethtool-5.14/NEWS 2021-09-12 22:48:28.000000000 +0200 +++ new/ethtool-5.15/NEWS 2021-11-09 21:12:41.000000000 +0100 @@ -1,3 +1,9 @@ +Version 5.15 - November 9, 2021 + * Feature: new extended link substates for bad signal (no arg) + * Feature: coalesce cqe mode attributes (-c and -C) + * Fix: multiple fixes of EEPROM module data parsing (-m) + * Fix: fix condition to display MDI-X info (no arg) + Version 5.14 - September 12, 2021 * Feature: do not silently ignore --json if unsupported * Feature: support new message types in pretty print diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-5.14/cmis.c new/ethtool-5.15/cmis.c --- old/ethtool-5.14/cmis.c 2021-07-09 00:16:22.000000000 +0200 +++ new/ethtool-5.15/cmis.c 2021-11-09 20:53:59.000000000 +0100 @@ -1,7 +1,7 @@ /** * Description: * - * This module adds QSFP-DD support to ethtool. The changes are similar to + * This module adds CMIS support to ethtool. The changes are similar to * the ones already existing in qsfp.c, but customized to use the memory * addresses and logic as defined in the specification's document. * @@ -271,7 +271,7 @@ PRINT_TEMP("Module temperature", OFFSET_TO_TEMP(CMIS_CURR_TEMP_OFFSET)); PRINT_VCC("Module voltage", - OFFSET_TO_U16(CMIS_CURR_CURR_OFFSET)); + OFFSET_TO_U16(CMIS_CURR_VCC_OFFSET)); } static void cmis_show_link_len_from_page(const __u8 *page_one_data) @@ -297,7 +297,7 @@ */ static void cmis_show_link_len(const __u8 *id) { - cmis_show_link_len_from_page(id + PAG01H_UPPER_OFFSET); + cmis_show_link_len_from_page(id); } /** @@ -307,6 +307,8 @@ */ static void cmis_show_vendor_info(const __u8 *id) { + const char *clei = (const char *)(id + CMIS_CLEI_START_OFFSET); + sff_show_ascii(id, CMIS_VENDOR_NAME_START_OFFSET, CMIS_VENDOR_NAME_END_OFFSET, "Vendor name"); cmis_show_oui(id); @@ -319,9 +321,9 @@ sff_show_ascii(id, CMIS_DATE_YEAR_OFFSET, CMIS_DATE_VENDOR_LOT_OFFSET + 1, "Date code"); - if (id[CMIS_CLEI_PRESENT_BYTE] & CMIS_CLEI_PRESENT_MASK) - sff_show_ascii(id, CMIS_CLEI_START_OFFSET, - CMIS_CLEI_END_OFFSET, "CLEI code"); + if (*clei && strncmp(clei, CMIS_CLEI_BLANK, CMIS_CLEI_LEN)) + sff_show_ascii(id, CMIS_CLEI_START_OFFSET, CMIS_CLEI_END_OFFSET, + "CLEI code"); } void qsfp_dd_show_all(const __u8 *id) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-5.14/cmis.h new/ethtool-5.15/cmis.h --- old/ethtool-5.14/cmis.h 2021-07-09 00:16:22.000000000 +0200 +++ new/ethtool-5.15/cmis.h 2021-11-09 20:53:59.000000000 +0100 @@ -11,7 +11,7 @@ /* Module-Level Monitors (Page 0) */ #define CMIS_CURR_TEMP_OFFSET 0x0E -#define CMIS_CURR_CURR_OFFSET 0x10 +#define CMIS_CURR_VCC_OFFSET 0x10 #define CMIS_CTOR_OFFSET 0xCB @@ -34,10 +34,10 @@ #define CMIS_DATE_VENDOR_LOT_OFFSET 0xBC /* CLEI Code (Page 0) */ -#define CMIS_CLEI_PRESENT_BYTE 0x02 -#define CMIS_CLEI_PRESENT_MASK 0x20 #define CMIS_CLEI_START_OFFSET 0xBE #define CMIS_CLEI_END_OFFSET 0xC7 +#define CMIS_CLEI_BLANK " " +#define CMIS_CLEI_LEN 0x0A /* Cable assembly length */ #define CMIS_CBL_ASM_LEN_OFFSET 0xCA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-5.14/configure new/ethtool-5.15/configure --- old/ethtool-5.14/configure 2021-09-12 22:58:12.000000000 +0200 +++ new/ethtool-5.15/configure 2021-11-09 21:16:53.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ethtool 5.14. +# Generated by GNU Autoconf 2.69 for ethtool 5.15. # # Report bugs to <[email protected]>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='ethtool' PACKAGE_TARNAME='ethtool' -PACKAGE_VERSION='5.14' -PACKAGE_STRING='ethtool 5.14' +PACKAGE_VERSION='5.15' +PACKAGE_STRING='ethtool 5.15' PACKAGE_BUGREPORT='[email protected]' 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.14 to adapt to many kinds of systems. +\`configure' configures ethtool 5.15 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.14:";; + short | recursive ) echo "Configuration of ethtool 5.15:";; 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.14 +ethtool configure 5.15 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.14, which was +It was created by ethtool $as_me 5.15, 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.14' + VERSION='5.15' 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.14, which was +This file was extended by ethtool $as_me 5.15, 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.14 +ethtool config.status 5.15 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.14/configure.ac new/ethtool-5.15/configure.ac --- old/ethtool-5.14/configure.ac 2021-09-12 22:40:59.000000000 +0200 +++ new/ethtool-5.15/configure.ac 2021-11-09 21:03:46.000000000 +0100 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(ethtool, 5.14, [email protected]) +AC_INIT(ethtool, 5.15, [email protected]) 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.14/ethtool.8 new/ethtool-5.15/ethtool.8 --- old/ethtool-5.14/ethtool.8 2021-09-12 22:58:14.000000000 +0200 +++ new/ethtool-5.15/ethtool.8 2021-11-09 21:16:54.000000000 +0100 @@ -117,7 +117,7 @@ . hy \\n(HY .. . -.TH ETHTOOL 8 "September 2021" "Ethtool version 5.14" +.TH ETHTOOL 8 "November 2021" "Ethtool version 5.15" .SH NAME ethtool \- query or control network driver and hardware settings . @@ -186,6 +186,8 @@ .BN tx\-usecs\-high .BN tx\-frames\-high .BN sample\-interval +.B2 cqe\-mode\-rx on off +.B2 cqe\-mode\-tx on off .HP .B ethtool \-g|\-\-show\-ring .I devname diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-5.14/ethtool.8.in new/ethtool-5.15/ethtool.8.in --- old/ethtool-5.14/ethtool.8.in 2021-09-12 22:41:37.000000000 +0200 +++ new/ethtool-5.15/ethtool.8.in 2021-11-09 21:03:46.000000000 +0100 @@ -117,7 +117,7 @@ . hy \\n(HY .. . -.TH ETHTOOL 8 "September 2021" "Ethtool version @VERSION@" +.TH ETHTOOL 8 "November 2021" "Ethtool version @VERSION@" .SH NAME ethtool \- query or control network driver and hardware settings . @@ -186,6 +186,8 @@ .BN tx\-usecs\-high .BN tx\-frames\-high .BN sample\-interval +.B2 cqe\-mode\-rx on off +.B2 cqe\-mode\-tx on off .HP .B ethtool \-g|\-\-show\-ring .I devname diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-5.14/ethtool.c new/ethtool-5.15/ethtool.c --- old/ethtool-5.14/ethtool.c 2021-09-12 22:37:37.000000000 +0200 +++ new/ethtool-5.15/ethtool.c 2021-11-09 20:53:59.000000000 +0100 @@ -1089,12 +1089,12 @@ return 0; } +#ifdef ETHTOOL_ENABLE_PRETTY_DUMP static const struct { const char *name; int (*func)(struct ethtool_drvinfo *info, struct ethtool_regs *regs); } driver_list[] = { -#ifdef ETHTOOL_ENABLE_PRETTY_DUMP { "8139cp", realtek_dump_regs }, { "8139too", realtek_dump_regs }, { "r8169", realtek_dump_regs }, @@ -1129,8 +1129,8 @@ { "fec", fec_dump_regs }, { "igc", igc_dump_regs }, { "bnxt_en", bnxt_dump_regs }, -#endif }; +#endif void dump_hex(FILE *file, const u8 *data, int len, int offset) { @@ -1149,14 +1149,15 @@ static int dump_regs(int gregs_dump_raw, int gregs_dump_hex, struct ethtool_drvinfo *info, struct ethtool_regs *regs) { - unsigned int i; - if (gregs_dump_raw) { fwrite(regs->data, regs->len, 1, stdout); goto nested; } - if (!gregs_dump_hex) +#ifdef ETHTOOL_ENABLE_PRETTY_DUMP + if (!gregs_dump_hex) { + unsigned int i; + for (i = 0; i < ARRAY_SIZE(driver_list); i++) if (!strncmp(driver_list[i].name, info->driver, ETHTOOL_BUSINFO_LEN)) { @@ -1168,6 +1169,8 @@ */ break; } + } +#endif dump_hex(stdout, regs->data, regs->len, 0); @@ -5703,6 +5706,8 @@ " [tx-usecs-high N]\n" " [tx-frames-high N]\n" " [sample-interval N]\n" + " [cqe-mode-rx on|off]\n" + " [cqe-mode-tx on|off]\n" }, { .opts = "-g|--show-ring", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-5.14/ethtool.spec new/ethtool-5.15/ethtool.spec --- old/ethtool-5.14/ethtool.spec 2021-09-12 22:58:14.000000000 +0200 +++ new/ethtool-5.15/ethtool.spec 2021-11-09 21:16:55.000000000 +0100 @@ -1,5 +1,5 @@ Name : ethtool -Version : 5.14 +Version : 5.15 Release : 1 Group : Utilities diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-5.14/netlink/coalesce.c new/ethtool-5.15/netlink/coalesce.c --- old/ethtool-5.14/netlink/coalesce.c 2021-09-12 22:37:37.000000000 +0200 +++ new/ethtool-5.15/netlink/coalesce.c 2021-09-12 23:28:33.000000000 +0200 @@ -66,6 +66,10 @@ show_u32(tb[ETHTOOL_A_COALESCE_TX_USECS_HIGH], "tx-usecs-high: "); show_u32(tb[ETHTOOL_A_COALESCE_TX_MAX_FRAMES_HIGH], "tx-frame-high: "); putchar('\n'); + show_bool("rx", "CQE mode RX: %s ", + tb[ETHTOOL_A_COALESCE_USE_CQE_MODE_RX]); + show_bool("tx", "TX: %s\n", tb[ETHTOOL_A_COALESCE_USE_CQE_MODE_TX]); + putchar('\n'); return MNL_CB_OK; } @@ -226,6 +230,18 @@ .handler = nl_parse_direct_u32, .min_argc = 1, }, + { + .arg = "cqe-mode-rx", + .type = ETHTOOL_A_COALESCE_USE_CQE_MODE_RX, + .handler = nl_parse_u8bool, + .min_argc = 1, + }, + { + .arg = "cqe-mode-tx", + .type = ETHTOOL_A_COALESCE_USE_CQE_MODE_TX, + .handler = nl_parse_u8bool, + .min_argc = 1, + }, {} }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-5.14/netlink/desc-ethtool.c new/ethtool-5.15/netlink/desc-ethtool.c --- old/ethtool-5.14/netlink/desc-ethtool.c 2021-09-12 22:37:37.000000000 +0200 +++ new/ethtool-5.15/netlink/desc-ethtool.c 2021-09-12 23:28:33.000000000 +0200 @@ -179,6 +179,8 @@ NLATTR_DESC_U32(ETHTOOL_A_COALESCE_TX_USECS_HIGH), NLATTR_DESC_U32(ETHTOOL_A_COALESCE_TX_MAX_FRAMES_HIGH), NLATTR_DESC_U32(ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL), + NLATTR_DESC_BOOL(ETHTOOL_A_COALESCE_USE_CQE_MODE_TX), + NLATTR_DESC_BOOL(ETHTOOL_A_COALESCE_USE_CQE_MODE_RX), }; static const struct pretty_nla_desc __pause_stats_desc[] = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-5.14/netlink/module-eeprom.c new/ethtool-5.15/netlink/module-eeprom.c --- old/ethtool-5.14/netlink/module-eeprom.c 2021-07-09 00:16:22.000000000 +0200 +++ new/ethtool-5.15/netlink/module-eeprom.c 2021-11-09 20:53:59.000000000 +0100 @@ -275,6 +275,7 @@ return nlsock_process_reply(nlsock, nomsg_reply_cb, NULL); } +#ifdef ETHTOOL_ENABLE_PRETTY_DUMP static int decoder_prefetch(struct nl_context *nlctx) { struct ethtool_module_eeprom *page_zero_lower = cache_get(0, 0, ETH_I2C_ADDRESS_LOW); @@ -338,6 +339,7 @@ break; } } +#endif int nl_getmodule(struct cmd_context *ctx) { @@ -365,6 +367,16 @@ return -EINVAL; } + /* When complete hex/raw dump of the EEPROM is requested, fallback to + * ioctl. Netlink can only request specific pages. + */ + if ((getmodule_cmd_params.dump_hex || getmodule_cmd_params.dump_raw) && + !getmodule_cmd_params.page && !getmodule_cmd_params.bank && + !getmodule_cmd_params.i2c_address) { + nlctx->ioctl_fallback = true; + return -EOPNOTSUPP; + } + request.i2c_address = ETH_I2C_ADDRESS_LOW; request.length = 128; ret = page_fetch(nlctx, &request); @@ -404,10 +416,12 @@ else dump_hex(stdout, eeprom_data, dump_length, request.offset); } else { +#ifdef ETHTOOL_ENABLE_PRETTY_DUMP ret = decoder_prefetch(nlctx); if (ret) goto cleanup; decoder_print(); +#endif } cleanup: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-5.14/netlink/settings.c new/ethtool-5.15/netlink/settings.c --- old/ethtool-5.14/netlink/settings.c 2021-09-12 22:37:37.000000000 +0200 +++ new/ethtool-5.15/netlink/settings.c 2021-11-09 20:58:12.000000000 +0100 @@ -560,7 +560,7 @@ print_enum(names_transceiver, ARRAY_SIZE(names_transceiver), val, "Transceiver"); } - if (tb[ETHTOOL_A_LINKINFO_TP_MDIX] && tb[ETHTOOL_A_LINKINFO_TP_MDIX] && + if (tb[ETHTOOL_A_LINKINFO_TP_MDIX] && tb[ETHTOOL_A_LINKINFO_TP_MDIX_CTRL] && port == PORT_TP) { uint8_t mdix = mnl_attr_get_u8(tb[ETHTOOL_A_LINKINFO_TP_MDIX]); uint8_t mdix_ctrl = @@ -639,6 +639,10 @@ "Large number of physical errors", [ETHTOOL_LINK_EXT_SUBSTATE_BSI_UNSUPPORTED_RATE] = "Unsupported rate", + [ETHTOOL_LINK_EXT_SUBSTATE_BSI_SERDES_REFERENCE_CLOCK_LOST] = + "Serdes reference clock lost", + [ETHTOOL_LINK_EXT_SUBSTATE_BSI_SERDES_ALOS] = + "Serdes ALOS", }; static const char *const names_cable_issue_link_ext_substate[] = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-5.14/qsfp.c new/ethtool-5.15/qsfp.c --- old/ethtool-5.14/qsfp.c 2021-07-09 00:16:22.000000000 +0200 +++ new/ethtool-5.15/qsfp.c 2021-11-09 20:53:59.000000000 +0100 @@ -64,7 +64,7 @@ static struct sff8636_aw_flags { const char *str; /* Human-readable string, null at the end */ - int offset; /* A2-relative address offset */ + int offset; __u8 value; /* Alarm is on if (offset & value) != 0. */ } sff8636_aw_flags[] = { { "Laser bias current high alarm (Chan 1)", @@ -738,7 +738,6 @@ sd->scd[i].rx_power = OFFSET_TO_U16(rx_power_offset); sd->scd[i].tx_power = OFFSET_TO_U16(tx_power_offset); } - } static void sff8636_show_dom(const __u8 *id, const __u8 *page_three, __u32 eeprom_len) @@ -819,8 +818,7 @@ } } - -static void sff6836_show_page_zero(const __u8 *id) +static void sff8636_show_page_zero(const __u8 *id) { sff8636_show_ext_identifier(id); sff8636_show_connector(id); @@ -863,11 +861,13 @@ } sff8636_show_identifier(id); - if ((id[SFF8636_ID_OFFSET] == SFF8024_ID_QSFP) || - (id[SFF8636_ID_OFFSET] == SFF8024_ID_QSFP_PLUS) || - (id[SFF8636_ID_OFFSET] == SFF8024_ID_QSFP28)) { - sff6836_show_page_zero(id); - sff8636_show_dom(id, id + SFF8636_PAGE03H_OFFSET, eeprom_len); + switch (id[SFF8636_ID_OFFSET]) { + case SFF8024_ID_QSFP: + case SFF8024_ID_QSFP_PLUS: + case SFF8024_ID_QSFP28: + sff8636_show_page_zero(id); + sff8636_show_dom(id, id + 3 * 0x80, eeprom_len); + break; } } @@ -875,7 +875,7 @@ const struct ethtool_module_eeprom *page_three) { sff8636_show_identifier(page_zero->data); - sff6836_show_page_zero(page_zero->data); + sff8636_show_page_zero(page_zero->data); if (page_three) sff8636_show_dom(page_zero->data, page_three->data - 0x80, ETH_MODULE_SFF_8636_MAX_LEN); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-5.14/uapi/linux/ethtool.h new/ethtool-5.15/uapi/linux/ethtool.h --- old/ethtool-5.14/uapi/linux/ethtool.h 2021-09-12 22:37:52.000000000 +0200 +++ new/ethtool-5.15/uapi/linux/ethtool.h 2021-11-09 21:00:06.000000000 +0100 @@ -637,6 +637,8 @@ enum ethtool_link_ext_substate_bad_signal_integrity { ETHTOOL_LINK_EXT_SUBSTATE_BSI_LARGE_NUMBER_OF_PHYSICAL_ERRORS = 1, ETHTOOL_LINK_EXT_SUBSTATE_BSI_UNSUPPORTED_RATE, + ETHTOOL_LINK_EXT_SUBSTATE_BSI_SERDES_REFERENCE_CLOCK_LOST, + ETHTOOL_LINK_EXT_SUBSTATE_BSI_SERDES_ALOS, }; /* More information in addition to ETHTOOL_LINK_EXT_STATE_CABLE_ISSUE. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-5.14/uapi/linux/ethtool_netlink.h new/ethtool-5.15/uapi/linux/ethtool_netlink.h --- old/ethtool-5.14/uapi/linux/ethtool_netlink.h 2021-09-12 22:37:52.000000000 +0200 +++ new/ethtool-5.15/uapi/linux/ethtool_netlink.h 2021-11-09 21:00:06.000000000 +0100 @@ -377,6 +377,8 @@ ETHTOOL_A_COALESCE_TX_USECS_HIGH, /* u32 */ ETHTOOL_A_COALESCE_TX_MAX_FRAMES_HIGH, /* u32 */ ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL, /* u32 */ + ETHTOOL_A_COALESCE_USE_CQE_MODE_TX, /* u8 */ + ETHTOOL_A_COALESCE_USE_CQE_MODE_RX, /* u8 */ /* add new constants above here */ __ETHTOOL_A_COALESCE_CNT, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-5.14/uapi/linux/if_link.h new/ethtool-5.15/uapi/linux/if_link.h --- old/ethtool-5.14/uapi/linux/if_link.h 2021-09-12 22:37:52.000000000 +0200 +++ new/ethtool-5.15/uapi/linux/if_link.h 2021-11-09 21:00:06.000000000 +0100 @@ -415,6 +415,7 @@ IFLA_INET6_ICMP6STATS, /* statistics (icmpv6) */ IFLA_INET6_TOKEN, /* device token */ IFLA_INET6_ADDR_GEN_MODE, /* implicit address generator mode */ + IFLA_INET6_RA_MTU, /* mtu carried in the RA message */ __IFLA_INET6_MAX }; @@ -477,6 +478,7 @@ IFLA_BR_MCAST_MLD_VERSION, IFLA_BR_VLAN_STATS_PER_PORT, IFLA_BR_MULTI_BOOLOPT, + IFLA_BR_MCAST_QUERIER_STATE, __IFLA_BR_MAX, }; @@ -853,6 +855,7 @@ IFLA_BOND_AD_ACTOR_SYSTEM, IFLA_BOND_TLB_DYNAMIC_LB, IFLA_BOND_PEER_NOTIF_DELAY, + IFLA_BOND_AD_LACP_ACTIVE, __IFLA_BOND_MAX, }; @@ -1258,4 +1261,14 @@ __u32 mask; }; +/* MCTP section */ + +enum { + IFLA_MCTP_UNSPEC, + IFLA_MCTP_NET, + __IFLA_MCTP_MAX, +}; + +#define IFLA_MCTP_MAX (__IFLA_MCTP_MAX - 1) + #endif /* _LINUX_IF_LINK_H */
