Hello community, here is the log from the commit of package ethtool for openSUSE:Factory checked in at 2018-09-04 22:48:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ethtool (Old) and /work/SRC/openSUSE:Factory/.ethtool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ethtool" Tue Sep 4 22:48:53 2018 rev:53 rq:632400 version:4.18 Changes: -------- --- /work/SRC/openSUSE:Factory/ethtool/ethtool.changes 2018-06-27 10:17:53.363748178 +0200 +++ /work/SRC/openSUSE:Factory/.ethtool.new/ethtool.changes 2018-09-04 22:48:55.099509751 +0200 @@ -1,0 +2,7 @@ +Fri Aug 24 21:48:57 UTC 2018 - [email protected] + +- Update to new upstream release 4.18 + * Feature: add support WoL using filters + * Feature: dump strings for ixgbe security registers + +------------------------------------------------------------------- Old: ---- ethtool-4.17.tar.sign ethtool-4.17.tar.xz New: ---- ethtool-4.18.tar.sign ethtool-4.18.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ethtool.spec ++++++ --- /var/tmp/diff_new_pack.t6yL8x/_old 2018-09-04 22:48:56.539514703 +0200 +++ /var/tmp/diff_new_pack.t6yL8x/_new 2018-09-04 22:48:56.575514827 +0200 @@ -17,7 +17,7 @@ Name: ethtool -Version: 4.17 +Version: 4.18 Release: 0 Summary: Examine and Tune Ethernet-Based Network Interfaces License: GPL-2.0-only ++++++ ethtool-4.17.tar.xz -> ethtool-4.18.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.17/NEWS new/ethtool-4.18/NEWS --- old/ethtool-4.17/NEWS 2018-06-15 21:42:01.000000000 +0200 +++ new/ethtool-4.18/NEWS 2018-08-24 20:25:43.000000000 +0200 @@ -1,3 +1,9 @@ +Version 4.18 - August 24, 2018 + * Feature: Add support for WAKE_FILTER (WoL using filters) + * Feature: Add support for action value -2 (wake-up filter) + * Fix: document WoL filters option also in help message + * Feature: ixgbe dump strings for security registers + Version 4.17 - June 15, 2018 * Fix: In ethtool.8, remove superfluous and incorrect \c. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.17/configure new/ethtool-4.18/configure --- old/ethtool-4.17/configure 2018-06-15 21:43:53.000000000 +0200 +++ new/ethtool-4.18/configure 2018-08-24 20:26:04.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 4.17. +# Generated by GNU Autoconf 2.69 for ethtool 4.18. # # Report bugs to <[email protected]>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='ethtool' PACKAGE_TARNAME='ethtool' -PACKAGE_VERSION='4.17' -PACKAGE_STRING='ethtool 4.17' +PACKAGE_VERSION='4.18' +PACKAGE_STRING='ethtool 4.18' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1237,7 +1237,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 4.17 to adapt to many kinds of systems. +\`configure' configures ethtool 4.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1303,7 +1303,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ethtool 4.17:";; + short | recursive ) echo "Configuration of ethtool 4.18:";; esac cat <<\_ACEOF @@ -1398,7 +1398,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ethtool configure 4.17 +ethtool configure 4.18 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1645,7 +1645,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 4.17, which was +It was created by ethtool $as_me 4.18, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2510,7 +2510,7 @@ # Define the identity of the package. PACKAGE='ethtool' - VERSION='4.17' + VERSION='4.18' cat >>confdefs.h <<_ACEOF @@ -4695,7 +4695,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 4.17, which was +This file was extended by ethtool $as_me 4.18, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4761,7 +4761,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 4.17 +ethtool config.status 4.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-4.17/configure.ac new/ethtool-4.18/configure.ac --- old/ethtool-4.17/configure.ac 2018-06-15 21:37:28.000000000 +0200 +++ new/ethtool-4.18/configure.ac 2018-08-24 20:22:08.000000000 +0200 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(ethtool, 4.17, [email protected]) +AC_INIT(ethtool, 4.18, [email protected]) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) AM_INIT_AUTOMAKE([gnu]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.17/ethtool-copy.h new/ethtool-4.18/ethtool-copy.h --- old/ethtool-4.17/ethtool-copy.h 2018-03-12 19:20:35.000000000 +0100 +++ new/ethtool-4.18/ethtool-copy.h 2018-08-16 20:26:43.000000000 +0200 @@ -215,12 +215,16 @@ __u32 data; }; +#define PFC_STORM_PREVENTION_AUTO 0xffff +#define PFC_STORM_PREVENTION_DISABLE 0 + enum tunable_id { ETHTOOL_ID_UNSPEC, ETHTOOL_RX_COPYBREAK, ETHTOOL_TX_COPYBREAK, + ETHTOOL_PFC_PREVENTION_TOUT, /* timeout in msecs */ /* - * Add your fresh new tubale attribute above and remember to update + * Add your fresh new tunable attribute above and remember to update * tunable_strings[] in net/core/ethtool.c */ __ETHTOOL_TUNABLE_COUNT, @@ -864,7 +868,8 @@ * includes the %FLOW_EXT or %FLOW_MAC_EXT flag * (see &struct ethtool_flow_ext description). * @ring_cookie: RX ring/queue index to deliver to, or %RX_CLS_FLOW_DISC - * if packets should be discarded + * if packets should be discarded, or %RX_CLS_FLOW_WAKE if the + * packets should be used for Wake-on-LAN with %WAKE_FILTER * @location: Location of rule in the table. Locations must be * numbered such that a flow matching multiple rules will be * classified according to the first (lowest numbered) rule. @@ -896,13 +901,13 @@ static __inline__ __u64 ethtool_get_flow_spec_ring(__u64 ring_cookie) { return ETHTOOL_RX_FLOW_SPEC_RING & ring_cookie; -}; +} static __inline__ __u64 ethtool_get_flow_spec_ring_vf(__u64 ring_cookie) { return (ETHTOOL_RX_FLOW_SPEC_RING_VF & ring_cookie) >> ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF; -}; +} /** * struct ethtool_rxnfc - command to get or set RX flow classification rules @@ -1628,6 +1633,7 @@ #define WAKE_ARP (1 << 4) #define WAKE_MAGIC (1 << 5) #define WAKE_MAGICSECURE (1 << 6) /* only meaningful if WAKE_MAGIC */ +#define WAKE_FILTER (1 << 7) /* L2-L4 network traffic flow types */ #define TCP_V4_FLOW 0x01 /* hash or spec (tcp_ip4_spec) */ @@ -1665,6 +1671,7 @@ #define RXH_DISCARD (1 << 31) #define RX_CLS_FLOW_DISC 0xffffffffffffffffULL +#define RX_CLS_FLOW_WAKE 0xfffffffffffffffeULL /* Special RX classification rule insert location values */ #define RX_CLS_LOC_SPECIAL 0x80000000 /* flag */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.17/ethtool.8 new/ethtool-4.18/ethtool.8 --- old/ethtool-4.17/ethtool.8 2018-06-15 21:48:17.000000000 +0200 +++ new/ethtool-4.18/ethtool.8 2018-08-24 20:31:42.000000000 +0200 @@ -58,7 +58,7 @@ .\" .\" \(*WO - wol flags .\" -.ds WO \fBp\fP|\fBu\fP|\fBm\fP|\fBb\fP|\fBa\fP|\fBg\fP|\fBs\fP|\fBd\fP... +.ds WO \fBp\fP|\fBu\fP|\fBm\fP|\fBb\fP|\fBa\fP|\fBg\fP|\fBs\fP|\fBf|\fBd\fP... .\" .\" \(*FL - flow type values .\" @@ -113,7 +113,7 @@ . hy \\n(HY .. . -.TH ETHTOOL 8 "June 2018" "Ethtool version 4.17" +.TH ETHTOOL 8 "August 2018" "Ethtool version 4.18" .SH NAME ethtool \- query or control network driver and hardware settings . @@ -679,6 +679,7 @@ a Wake on ARP g Wake on MagicPacket\[tm] s Enable SecureOn\[tm] password for MagicPacket\[tm] +f Wake on filter(s) d T{ Disable (wake on nothing). This option clears all previous options. T} @@ -870,6 +871,7 @@ nokeep; lB l. -1 Drop the matched flow +-2 Use the matched flow as a Wake-on-LAN filter 0 or higher Rx queue to route the flow .TE .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.17/ethtool.8.in new/ethtool-4.18/ethtool.8.in --- old/ethtool-4.17/ethtool.8.in 2018-06-15 21:38:06.000000000 +0200 +++ new/ethtool-4.18/ethtool.8.in 2018-08-24 20:22:39.000000000 +0200 @@ -58,7 +58,7 @@ .\" .\" \(*WO - wol flags .\" -.ds WO \fBp\fP|\fBu\fP|\fBm\fP|\fBb\fP|\fBa\fP|\fBg\fP|\fBs\fP|\fBd\fP... +.ds WO \fBp\fP|\fBu\fP|\fBm\fP|\fBb\fP|\fBa\fP|\fBg\fP|\fBs\fP|\fBf|\fBd\fP... .\" .\" \(*FL - flow type values .\" @@ -113,7 +113,7 @@ . hy \\n(HY .. . -.TH ETHTOOL 8 "June 2018" "Ethtool version @VERSION@" +.TH ETHTOOL 8 "August 2018" "Ethtool version @VERSION@" .SH NAME ethtool \- query or control network driver and hardware settings . @@ -679,6 +679,7 @@ a Wake on ARP g Wake on MagicPacket\[tm] s Enable SecureOn\[tm] password for MagicPacket\[tm] +f Wake on filter(s) d T{ Disable (wake on nothing). This option clears all previous options. T} @@ -870,6 +871,7 @@ nokeep; lB l. -1 Drop the matched flow +-2 Use the matched flow as a Wake-on-LAN filter 0 or higher Rx queue to route the flow .TE .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.17/ethtool.c new/ethtool-4.18/ethtool.c --- old/ethtool-4.17/ethtool.c 2018-06-13 20:23:09.000000000 +0200 +++ new/ethtool-4.18/ethtool.c 2018-08-18 23:35:26.000000000 +0200 @@ -931,6 +931,9 @@ case 's': *data |= WAKE_MAGICSECURE; break; + case 'f': + *data |= WAKE_FILTER; + break; case 'd': *data = 0; break; @@ -964,6 +967,8 @@ *p++ = 'g'; if (wolopts & WAKE_MAGICSECURE) *p++ = 's'; + if (wolopts & WAKE_FILTER) + *p++ = 'f'; } else { *p = 'd'; } @@ -5064,7 +5069,7 @@ " [ advertise %x ]\n" " [ phyad %d ]\n" " [ xcvr internal|external ]\n" - " [ wol p|u|m|b|a|g|s|d... ]\n" + " [ wol p|u|m|b|a|g|s|f|d... ]\n" " [ sopass %x:%x:%x:%x:%x:%x ]\n" " [ msglvl %d | msglvl type on|off ... ]\n" }, { "-a|--show-pause", 1, do_gpause, "Show pause options" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.17/ethtool.spec new/ethtool-4.18/ethtool.spec --- old/ethtool-4.17/ethtool.spec 2018-06-15 21:48:17.000000000 +0200 +++ new/ethtool-4.18/ethtool.spec 2018-08-24 20:31:43.000000000 +0200 @@ -1,5 +1,5 @@ Name : ethtool -Version : 4.17 +Version : 4.18 Release : 1 Group : Utilities diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.17/ixgbe.c new/ethtool-4.18/ixgbe.c --- old/ethtool-4.17/ixgbe.c 2017-12-18 19:23:34.000000000 +0100 +++ new/ethtool-4.18/ixgbe.c 2018-08-10 20:43:21.000000000 +0200 @@ -1265,5 +1265,31 @@ regs_buff[1127]); } + if (regs_buff_len > 1139 && mac_type != ixgbe_mac_82598EB) { + fprintf(stdout, + "0x08800: SECTXCTRL (Security Tx Control) 0x%08X\n", + regs_buff[1139]); + + fprintf(stdout, + "0x08804: SECTXSTAT (Security Tx Status) 0x%08X\n", + regs_buff[1140]); + + fprintf(stdout, + "0x08808: SECTXBUFFAF (Security Tx Buffer Almost Full) 0x%08X\n", + regs_buff[1141]); + + fprintf(stdout, + "0x08800: SECTXMINIFG (Security Tx Buffer Minimum IFG) 0x%08X\n", + regs_buff[1142]); + + fprintf(stdout, + "0x08800: SECRXCTRL (Security Rx Control) 0x%08X\n", + regs_buff[1143]); + + fprintf(stdout, + "0x08800: SECRXSTAT (Security Rx Status) 0x%08X\n", + regs_buff[1144]); + } + return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.17/rxclass.c new/ethtool-4.18/rxclass.c --- old/ethtool-4.17/rxclass.c 2018-06-13 20:23:09.000000000 +0200 +++ new/ethtool-4.18/rxclass.c 2018-08-16 20:26:43.000000000 +0200 @@ -251,7 +251,11 @@ if (fsp->flow_type & FLOW_RSS) fprintf(stdout, "\tRSS Context ID: %u\n", rss_context); - if (fsp->ring_cookie != RX_CLS_FLOW_DISC) { + if (fsp->ring_cookie == RX_CLS_FLOW_DISC) { + fprintf(stdout, "\tAction: Drop\n"); + } else if (fsp->ring_cookie == RX_CLS_FLOW_WAKE) { + fprintf(stdout, "\tAction: Wake-on-LAN\n"); + } else { u64 vf = ethtool_get_flow_spec_ring_vf(fsp->ring_cookie); u64 queue = ethtool_get_flow_spec_ring(fsp->ring_cookie); @@ -266,8 +270,6 @@ else fprintf(stdout, "\tAction: Direct to queue %llu\n", queue); - } else { - fprintf(stdout, "\tAction: Drop\n"); } fprintf(stdout, "\n");
