Hello community, here is the log from the commit of package ethtool for openSUSE:Factory checked in at 2018-06-27 10:17:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ethtool (Old) and /work/SRC/openSUSE:Factory/.ethtool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ethtool" Wed Jun 27 10:17:44 2018 rev:52 rq:618948 version:4.17 Changes: -------- --- /work/SRC/openSUSE:Factory/ethtool/ethtool.changes 2018-04-24 15:30:32.831827623 +0200 +++ /work/SRC/openSUSE:Factory/.ethtool.new/ethtool.changes 2018-06-27 10:17:53.363748178 +0200 @@ -1,0 +2,14 @@ +Wed Jun 20 09:34:25 UTC 2018 - [email protected] + +- Update to new upstream release 4.17 + * Fix: In ethtool.8, remove superfluous and incorrect \c + * Fix: fix uninitialized return value + * Fix: fix RING_VF assignment + * Fix: remove unused global variable + * Fix: several fixes in do_gregs() + * Fix: correctly free hkey when get_stringset() fails + * Fix: remove unreachable code + * Fix: fix stack clash in do_get_phy_tunable and do_set_phy_tunable + * Feature: Add register dump support for MICROCHIP LAN78xx + +------------------------------------------------------------------- Old: ---- ethtool-4.16.tar.sign ethtool-4.16.tar.xz New: ---- ethtool-4.17.tar.sign ethtool-4.17.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ethtool.spec ++++++ --- /var/tmp/diff_new_pack.T2R2Jl/_old 2018-06-27 10:17:54.371711519 +0200 +++ /var/tmp/diff_new_pack.T2R2Jl/_new 2018-06-27 10:17:54.375711373 +0200 @@ -17,7 +17,7 @@ Name: ethtool -Version: 4.16 +Version: 4.17 Release: 0 Summary: Examine and Tune Ethernet-Based Network Interfaces License: GPL-2.0-only ++++++ ethtool-4.16.tar.xz -> ethtool-4.17.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.16/Makefile.am new/ethtool-4.17/Makefile.am --- old/ethtool-4.16/Makefile.am 2017-06-02 19:27:13.000000000 +0200 +++ new/ethtool-4.17/Makefile.am 2018-04-16 19:53:04.000000000 +0200 @@ -14,7 +14,7 @@ pcnet32.c realtek.c tg3.c marvell.c vioc.c \ smsc911x.c at76c50x-usb.c sfc.c stmmac.c \ sff-common.c sff-common.h sfpid.c sfpdiag.c \ - ixgbevf.c tse.c vmxnet3.c qsfp.c qsfp.h fjes.c + ixgbevf.c tse.c vmxnet3.c qsfp.c qsfp.h fjes.c lan78xx.c endif TESTS = test-cmdline test-features diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.16/Makefile.in new/ethtool-4.17/Makefile.in --- old/ethtool-4.16/Makefile.in 2018-04-13 19:51:06.000000000 +0200 +++ new/ethtool-4.17/Makefile.in 2018-06-15 21:48:15.000000000 +0200 @@ -93,7 +93,7 @@ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ pcnet32.c realtek.c tg3.c marvell.c vioc.c \ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ smsc911x.c at76c50x-usb.c sfc.c stmmac.c \ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ sff-common.c sff-common.h sfpid.c sfpdiag.c \ -@ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ ixgbevf.c tse.c vmxnet3.c qsfp.c qsfp.h fjes.c +@ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ ixgbevf.c tse.c vmxnet3.c qsfp.c qsfp.h fjes.c lan78xx.c TESTS = test-cmdline$(EXEEXT) test-features$(EXEEXT) check_PROGRAMS = test-cmdline$(EXEEXT) test-features$(EXEEXT) @@ -118,7 +118,7 @@ natsemi.c pcnet32.c realtek.c tg3.c marvell.c vioc.c \ smsc911x.c at76c50x-usb.c sfc.c stmmac.c sff-common.c \ sff-common.h sfpid.c sfpdiag.c ixgbevf.c tse.c vmxnet3.c \ - qsfp.c qsfp.h fjes.c + qsfp.c qsfp.h fjes.c lan78xx.c @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@am__objects_1 = amd8111e.$(OBJEXT) \ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ de2104x.$(OBJEXT) \ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ e100.$(OBJEXT) \ @@ -145,7 +145,8 @@ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ ixgbevf.$(OBJEXT) \ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ tse.$(OBJEXT) \ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ vmxnet3.$(OBJEXT) \ -@ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ qsfp.$(OBJEXT) fjes.$(OBJEXT) +@ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ qsfp.$(OBJEXT) fjes.$(OBJEXT) \ +@ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ lan78xx.$(OBJEXT) am_ethtool_OBJECTS = ethtool.$(OBJEXT) rxclass.$(OBJEXT) \ $(am__objects_1) ethtool_OBJECTS = $(am_ethtool_OBJECTS) @@ -157,7 +158,7 @@ ibm_emac.c ixgb.c ixgbe.c natsemi.c pcnet32.c realtek.c tg3.c \ marvell.c vioc.c smsc911x.c at76c50x-usb.c sfc.c stmmac.c \ sff-common.c sff-common.h sfpid.c sfpdiag.c ixgbevf.c tse.c \ - vmxnet3.c qsfp.c qsfp.h fjes.c + vmxnet3.c qsfp.c qsfp.h fjes.c lan78xx.c @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@am__objects_2 = test_cmdline-amd8111e.$(OBJEXT) \ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ test_cmdline-de2104x.$(OBJEXT) \ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ test_cmdline-e100.$(OBJEXT) \ @@ -185,7 +186,8 @@ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ test_cmdline-tse.$(OBJEXT) \ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ test_cmdline-vmxnet3.$(OBJEXT) \ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ test_cmdline-qsfp.$(OBJEXT) \ -@ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ test_cmdline-fjes.$(OBJEXT) +@ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ test_cmdline-fjes.$(OBJEXT) \ +@ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ test_cmdline-lan78xx.$(OBJEXT) am__objects_3 = test_cmdline-ethtool.$(OBJEXT) \ test_cmdline-rxclass.$(OBJEXT) $(am__objects_2) am_test_cmdline_OBJECTS = test_cmdline-test-cmdline.$(OBJEXT) \ @@ -201,7 +203,7 @@ fec_8xx.c ibm_emac.c ixgb.c ixgbe.c natsemi.c pcnet32.c \ realtek.c tg3.c marvell.c vioc.c smsc911x.c at76c50x-usb.c \ sfc.c stmmac.c sff-common.c sff-common.h sfpid.c sfpdiag.c \ - ixgbevf.c tse.c vmxnet3.c qsfp.c qsfp.h fjes.c + ixgbevf.c tse.c vmxnet3.c qsfp.c qsfp.h fjes.c lan78xx.c @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@am__objects_4 = test_features-amd8111e.$(OBJEXT) \ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ test_features-de2104x.$(OBJEXT) \ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ test_features-e100.$(OBJEXT) \ @@ -229,7 +231,8 @@ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ test_features-tse.$(OBJEXT) \ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ test_features-vmxnet3.$(OBJEXT) \ @ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ test_features-qsfp.$(OBJEXT) \ -@ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ test_features-fjes.$(OBJEXT) +@ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ test_features-fjes.$(OBJEXT) \ +@ETHTOOL_ENABLE_PRETTY_DUMP_TRUE@ test_features-lan78xx.$(OBJEXT) am__objects_5 = test_features-ethtool.$(OBJEXT) \ test_features-rxclass.$(OBJEXT) $(am__objects_4) am_test_features_OBJECTS = test_features-test-features.$(OBJEXT) \ @@ -763,6 +766,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ixgb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ixgbe.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ixgbevf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lan78xx.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/marvell.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/natsemi.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcnet32.Po@am__quote@ @@ -789,6 +793,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmdline-ixgb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmdline-ixgbe.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmdline-ixgbevf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmdline-lan78xx.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmdline-marvell.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmdline-natsemi.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmdline-pcnet32.Po@am__quote@ @@ -821,6 +826,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_features-ixgb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_features-ixgbe.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_features-ixgbevf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_features-lan78xx.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_features-marvell.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_features-natsemi.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_features-pcnet32.Po@am__quote@ @@ -1306,6 +1312,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_cmdline_CFLAGS) $(CFLAGS) -c -o test_cmdline-fjes.obj `if test -f 'fjes.c'; then $(CYGPATH_W) 'fjes.c'; else $(CYGPATH_W) '$(srcdir)/fjes.c'; fi` +test_cmdline-lan78xx.o: lan78xx.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_cmdline_CFLAGS) $(CFLAGS) -MT test_cmdline-lan78xx.o -MD -MP -MF $(DEPDIR)/test_cmdline-lan78xx.Tpo -c -o test_cmdline-lan78xx.o `test -f 'lan78xx.c' || echo '$(srcdir)/'`lan78xx.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_cmdline-lan78xx.Tpo $(DEPDIR)/test_cmdline-lan78xx.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lan78xx.c' object='test_cmdline-lan78xx.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_cmdline_CFLAGS) $(CFLAGS) -c -o test_cmdline-lan78xx.o `test -f 'lan78xx.c' || echo '$(srcdir)/'`lan78xx.c + +test_cmdline-lan78xx.obj: lan78xx.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_cmdline_CFLAGS) $(CFLAGS) -MT test_cmdline-lan78xx.obj -MD -MP -MF $(DEPDIR)/test_cmdline-lan78xx.Tpo -c -o test_cmdline-lan78xx.obj `if test -f 'lan78xx.c'; then $(CYGPATH_W) 'lan78xx.c'; else $(CYGPATH_W) '$(srcdir)/lan78xx.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_cmdline-lan78xx.Tpo $(DEPDIR)/test_cmdline-lan78xx.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lan78xx.c' object='test_cmdline-lan78xx.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_cmdline_CFLAGS) $(CFLAGS) -c -o test_cmdline-lan78xx.obj `if test -f 'lan78xx.c'; then $(CYGPATH_W) 'lan78xx.c'; else $(CYGPATH_W) '$(srcdir)/lan78xx.c'; fi` + test_features-test-features.o: test-features.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_features_CFLAGS) $(CFLAGS) -MT test_features-test-features.o -MD -MP -MF $(DEPDIR)/test_features-test-features.Tpo -c -o test_features-test-features.o `test -f 'test-features.c' || echo '$(srcdir)/'`test-features.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_features-test-features.Tpo $(DEPDIR)/test_features-test-features.Po @@ -1753,6 +1773,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fjes.c' object='test_features-fjes.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_features_CFLAGS) $(CFLAGS) -c -o test_features-fjes.obj `if test -f 'fjes.c'; then $(CYGPATH_W) 'fjes.c'; else $(CYGPATH_W) '$(srcdir)/fjes.c'; fi` + +test_features-lan78xx.o: lan78xx.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_features_CFLAGS) $(CFLAGS) -MT test_features-lan78xx.o -MD -MP -MF $(DEPDIR)/test_features-lan78xx.Tpo -c -o test_features-lan78xx.o `test -f 'lan78xx.c' || echo '$(srcdir)/'`lan78xx.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_features-lan78xx.Tpo $(DEPDIR)/test_features-lan78xx.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lan78xx.c' object='test_features-lan78xx.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_features_CFLAGS) $(CFLAGS) -c -o test_features-lan78xx.o `test -f 'lan78xx.c' || echo '$(srcdir)/'`lan78xx.c + +test_features-lan78xx.obj: lan78xx.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_features_CFLAGS) $(CFLAGS) -MT test_features-lan78xx.obj -MD -MP -MF $(DEPDIR)/test_features-lan78xx.Tpo -c -o test_features-lan78xx.obj `if test -f 'lan78xx.c'; then $(CYGPATH_W) 'lan78xx.c'; else $(CYGPATH_W) '$(srcdir)/lan78xx.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_features-lan78xx.Tpo $(DEPDIR)/test_features-lan78xx.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lan78xx.c' object='test_features-lan78xx.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_features_CFLAGS) $(CFLAGS) -c -o test_features-lan78xx.obj `if test -f 'lan78xx.c'; then $(CYGPATH_W) 'lan78xx.c'; else $(CYGPATH_W) '$(srcdir)/lan78xx.c'; fi` install-man8: $(man_MANS) @$(NORMAL_INSTALL) @list1=''; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.16/NEWS new/ethtool-4.17/NEWS --- old/ethtool-4.16/NEWS 2018-04-13 19:48:13.000000000 +0200 +++ new/ethtool-4.17/NEWS 2018-06-15 21:42:01.000000000 +0200 @@ -1,3 +1,15 @@ +Version 4.17 - June 15, 2018 + + * Fix: In ethtool.8, remove superfluous and incorrect \c. + * Fix: fix uninitialized return value + * Fix: fix RING_VF assignment + * Fix: remove unused global variable + * Fix: several fixes in do_gregs() + * Fix: correctly free hkey when get_stringset() fails + * Fix: remove unreachable code + * Fix: fix stack clash in do_get_phy_tunable and do_set_phy_tunable + * Feature: Add register dump support for MICROCHIP LAN78xx + Version 4.16 - April 13, 2018 * Feature: add support for extra RSS contexts and RSS steering filters diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.16/configure new/ethtool-4.17/configure --- old/ethtool-4.16/configure 2018-04-13 19:51:06.000000000 +0200 +++ new/ethtool-4.17/configure 2018-06-15 21:43:53.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.16. +# Generated by GNU Autoconf 2.69 for ethtool 4.17. # # Report bugs to <[email protected]>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='ethtool' PACKAGE_TARNAME='ethtool' -PACKAGE_VERSION='4.16' -PACKAGE_STRING='ethtool 4.16' +PACKAGE_VERSION='4.17' +PACKAGE_STRING='ethtool 4.17' 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.16 to adapt to many kinds of systems. +\`configure' configures ethtool 4.17 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.16:";; + short | recursive ) echo "Configuration of ethtool 4.17:";; 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.16 +ethtool configure 4.17 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.16, which was +It was created by ethtool $as_me 4.17, 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.16' + VERSION='4.17' 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.16, which was +This file was extended by ethtool $as_me 4.17, 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.16 +ethtool config.status 4.17 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.16/configure.ac new/ethtool-4.17/configure.ac --- old/ethtool-4.16/configure.ac 2018-04-13 19:42:13.000000000 +0200 +++ new/ethtool-4.17/configure.ac 2018-06-15 21:37:28.000000000 +0200 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(ethtool, 4.16, [email protected]) +AC_INIT(ethtool, 4.17, [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.16/ethtool.8 new/ethtool-4.17/ethtool.8 --- old/ethtool-4.16/ethtool.8 2018-04-13 19:51:07.000000000 +0200 +++ new/ethtool-4.17/ethtool.8 2018-06-15 21:48:17.000000000 +0200 @@ -113,7 +113,7 @@ . hy \\n(HY .. . -.TH ETHTOOL 8 "April 2018" "Ethtool version 4.16" +.TH ETHTOOL 8 "June 2018" "Ethtool version 4.17" .SH NAME ethtool \- query or control network driver and hardware settings . @@ -684,7 +684,7 @@ T} .TE .TP -.B sopass \*(MA\c +.B sopass \*(MA Sets the SecureOn\[tm] password. The argument to this option must be 6 bytes in Ethernet MAC hex format (\*(MA). .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.16/ethtool.8.in new/ethtool-4.17/ethtool.8.in --- old/ethtool-4.16/ethtool.8.in 2018-04-13 19:42:48.000000000 +0200 +++ new/ethtool-4.17/ethtool.8.in 2018-06-15 21:38:06.000000000 +0200 @@ -113,7 +113,7 @@ . hy \\n(HY .. . -.TH ETHTOOL 8 "April 2018" "Ethtool version @VERSION@" +.TH ETHTOOL 8 "June 2018" "Ethtool version @VERSION@" .SH NAME ethtool \- query or control network driver and hardware settings . @@ -684,7 +684,7 @@ T} .TE .TP -.B sopass \*(MA\c +.B sopass \*(MA Sets the SecureOn\[tm] password. The argument to this option must be 6 bytes in Ethernet MAC hex format (\*(MA). .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.16/ethtool.c new/ethtool-4.17/ethtool.c --- old/ethtool-4.16/ethtool.c 2018-03-29 20:38:54.000000000 +0200 +++ new/ethtool-4.17/ethtool.c 2018-06-13 20:23:09.000000000 +0200 @@ -1160,6 +1160,7 @@ { "altera_tse", altera_tse_dump_regs }, { "vmxnet3", vmxnet3_dump_regs }, { "fjes", fjes_dump_regs }, + { "lan78xx", lan78xx_dump_regs }, #endif }; @@ -3178,17 +3179,26 @@ if (!gregs_dump_raw && gregs_dump_file != NULL) { /* overwrite reg values from file dump */ FILE *f = fopen(gregs_dump_file, "r"); + struct ethtool_regs *nregs; struct stat st; size_t nread; if (!f || fstat(fileno(f), &st) < 0) { fprintf(stderr, "Can't open '%s': %s\n", gregs_dump_file, strerror(errno)); + if (f) + fclose(f); free(regs); return 75; } - regs = realloc(regs, sizeof(*regs) + st.st_size); + nregs = realloc(regs, sizeof(*regs) + st.st_size); + if (!nregs) { + perror("Cannot allocate memory for register dump"); + free(regs); /* was not freed by realloc */ + return 73; + } + regs = nregs; regs->len = st.st_size; nread = fread(regs->data, regs->len, 1, f); fclose(f); @@ -3900,7 +3910,7 @@ static int do_srxfh(struct cmd_context *ctx) { struct ethtool_rxfh rss_head = {0}; - struct ethtool_rxfh *rss; + struct ethtool_rxfh *rss = NULL; struct ethtool_rxnfc ring_count; int rxfhindir_equal = 0, rxfhindir_default = 0; struct ethtool_gstrings *hfuncs = NULL; @@ -4054,7 +4064,8 @@ hfuncs = get_stringset(ctx, ETH_SS_RSS_HASH_FUNCS, 0, 1); if (!hfuncs) { perror("Cannot get hash functions names"); - return 1; + err = 1; + goto free; } for (i = 0; i < hfuncs->len && !req_hfunc ; i++) { @@ -4068,8 +4079,8 @@ if (!req_hfunc) { fprintf(stderr, "Unknown hash function: %s\n", req_hfunc_name); - free(hfuncs); - return 1; + err = 1; + goto free; } } @@ -4110,9 +4121,7 @@ } free: - if (hkey) - free(hkey); - + free(hkey); free(rss); free(hfuncs); return err; @@ -4722,8 +4731,8 @@ { int argc = ctx->argc; char **argp = ctx->argp; - int err, i; u8 downshift_changed = 0; + int i; if (argc < 1) exit_bad_args(); @@ -4739,27 +4748,28 @@ } if (downshift_changed) { - struct ethtool_tunable ds; + struct { + struct ethtool_tunable ds; + u8 __count; + } cont; u8 count = 0; - ds.cmd = ETHTOOL_PHY_GTUNABLE; - ds.id = ETHTOOL_PHY_DOWNSHIFT; - ds.type_id = ETHTOOL_TUNABLE_U8; - ds.len = 1; - ds.data[0] = &count; - err = send_ioctl(ctx, &ds); - if (err < 0) { + cont.ds.cmd = ETHTOOL_PHY_GTUNABLE; + cont.ds.id = ETHTOOL_PHY_DOWNSHIFT; + cont.ds.type_id = ETHTOOL_TUNABLE_U8; + cont.ds.len = 1; + if (send_ioctl(ctx, &cont.ds) < 0) { perror("Cannot Get PHY downshift count"); return 87; } - count = *((u8 *)&ds.data[0]); + count = *((u8 *)&cont.ds.data[0]); if (count) fprintf(stdout, "Downshift count: %d\n", count); else fprintf(stdout, "Downshift disabled\n"); } - return err; + return 0; } static __u32 parse_reset(char *val, __u32 bitset, char *arg, __u32 *data) @@ -4930,16 +4940,17 @@ /* Do it */ if (ds_changed) { - struct ethtool_tunable ds; - u8 count; - - ds.cmd = ETHTOOL_PHY_STUNABLE; - ds.id = ETHTOOL_PHY_DOWNSHIFT; - ds.type_id = ETHTOOL_TUNABLE_U8; - ds.len = 1; - ds.data[0] = &count; - *((u8 *)&ds.data[0]) = ds_cnt; - err = send_ioctl(ctx, &ds); + struct { + struct ethtool_tunable ds; + u8 __count; + } cont; + + cont.ds.cmd = ETHTOOL_PHY_STUNABLE; + cont.ds.id = ETHTOOL_PHY_DOWNSHIFT; + cont.ds.type_id = ETHTOOL_TUNABLE_U8; + cont.ds.len = 1; + *((u8 *)&cont.ds.data[0]) = ds_cnt; + err = send_ioctl(ctx, &cont.ds); if (err < 0) { perror("Cannot Set PHY downshift count"); err = 87; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.16/ethtool.spec new/ethtool-4.17/ethtool.spec --- old/ethtool-4.16/ethtool.spec 2018-04-13 19:51:08.000000000 +0200 +++ new/ethtool-4.17/ethtool.spec 2018-06-15 21:48:17.000000000 +0200 @@ -1,5 +1,5 @@ Name : ethtool -Version : 4.16 +Version : 4.17 Release : 1 Group : Utilities diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.16/internal.h new/ethtool-4.17/internal.h --- old/ethtool-4.16/internal.h 2018-03-12 19:20:35.000000000 +0100 +++ new/ethtool-4.17/internal.h 2018-04-16 19:53:04.000000000 +0200 @@ -350,4 +350,8 @@ /* FUJITSU Extended Socket network device */ int fjes_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs); + +/* MICROCHIP LAN78XX USB ETHERNET Controller */ +int lan78xx_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs); + #endif /* ETHTOOL_INTERNAL_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.16/lan78xx.c new/ethtool-4.17/lan78xx.c --- old/ethtool-4.16/lan78xx.c 1970-01-01 01:00:00.000000000 +0100 +++ new/ethtool-4.17/lan78xx.c 2018-04-16 19:53:04.000000000 +0200 @@ -0,0 +1,87 @@ +#include <stdio.h> +#include <string.h> +#include "internal.h" + +int lan78xx_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs) +{ + unsigned int *lan78xx_reg = (unsigned int *)regs->data; + + fprintf(stdout, "LAN78xx Registers:\n"); + fprintf(stdout, "------------------\n"); + fprintf(stdout, "ID_REV = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "INT_STS = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "HW_CFG = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "PMT_CTRL = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "E2P_CMD = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "E2P_DATA = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "USB_STATUS = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "VLAN_TYPE = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "\n"); + + fprintf(stdout, "MAC Registers:\n"); + fprintf(stdout, "--------------\n"); + fprintf(stdout, "MAC_CR = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "MAC_RX = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "MAC_TX = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "FLOW = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "ERR_STS = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "MII_ACC = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "MII_DATA = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "EEE_TX_LPI_REQ_DLY = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "EEE_TW_TX_SYS = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "EEE_TX_LPI_REM_DLY = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "WUCSR = 0x%08X\n", *lan78xx_reg++); + fprintf(stdout, "\n"); + + fprintf(stdout, "PHY Registers:\n"); + fprintf(stdout, "--------------\n"); + fprintf(stdout, "Mode Control = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "Mode Status = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "Device identifier1 = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "Device identifier2 = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "Auto-Neg Advertisement = 0x%04X\n", + *lan78xx_reg++); + fprintf(stdout, "Auto-Neg Link Partner Ability = 0x%04X\n", + *lan78xx_reg++); + fprintf(stdout, "Auto-Neg Expansion = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "Auto-Neg Next Page TX = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "Auto-Neg Link Partner Next Page RX = 0x%04X\n", + *lan78xx_reg++); + fprintf(stdout, "1000BASE-T Control = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "1000BASE-T Status = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "Reserved = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "Reserved = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "MMD Access Control = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "MMD Access Address/Data = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "1000BASE-T Status Extension1 = 0x%04X\n", + *lan78xx_reg++); + fprintf(stdout, "1000BASE-TX Status Extension = 0x%04X\n", + *lan78xx_reg++); + fprintf(stdout, "1000BASE-T Status Extension2 = 0x%04X\n", + *lan78xx_reg++); + fprintf(stdout, "Bypass Control = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, + "100BASE-TX/1000BASE-T Rx Error Counter = 0x%04X\n", + *lan78xx_reg++); + fprintf(stdout, + "100BASE-TX/1000BASE-T FC Err Counter = 0x%04X\n", + *lan78xx_reg++); + fprintf(stdout, + "10BASE-T/100BASE-TX/1000BASE-T LD Counter = 0x%04X\n", + *lan78xx_reg++); + fprintf(stdout, "Extended 10BASE-T Control and Status = 0x%04X\n", + *lan78xx_reg++); + fprintf(stdout, "Extended PHY Control1 = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "Extended PHY Control2 = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "Interrupt Mask = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "Interrupt Status = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "Reserved = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "Auxiliary Control and Status = 0x%04X\n", + *lan78xx_reg++); + fprintf(stdout, "LED Mode Select = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "LED Behavior = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "Extended Page Access = 0x%04X\n", *lan78xx_reg++); + fprintf(stdout, "\n"); + + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.16/qsfp.c new/ethtool-4.17/qsfp.c --- old/ethtool-4.16/qsfp.c 2018-02-27 20:19:33.000000000 +0100 +++ new/ethtool-4.17/qsfp.c 2018-06-13 20:23:09.000000000 +0200 @@ -661,9 +661,6 @@ tx_power_offset = SFF8636_TX_PWR_4_OFFSET; tx_bias_offset = SFF8636_TX_BIAS_4_OFFSET; break; - default: - printf(" Invalid channel: %d\n", i); - break; } sd->scd[i].bias_cur = OFFSET_TO_U16(tx_bias_offset); sd->scd[i].rx_power = OFFSET_TO_U16(rx_power_offset); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.16/rxclass.c new/ethtool-4.17/rxclass.c --- old/ethtool-4.16/rxclass.c 2018-03-12 19:20:35.000000000 +0100 +++ new/ethtool-4.17/rxclass.c 2018-06-13 20:23:09.000000000 +0200 @@ -1066,7 +1066,7 @@ val++; *(u64 *)&p[opt->offset] &= ~ETHTOOL_RX_FLOW_SPEC_RING_VF; - *(u64 *)&p[opt->offset] = (u64)val << ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF; + *(u64 *)&p[opt->offset] |= (u64)val << ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF; break; } case OPT_RING_QUEUE: { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ethtool-4.16/sfc.c new/ethtool-4.17/sfc.c --- old/ethtool-4.16/sfc.c 2016-09-30 21:06:09.000000000 +0200 +++ new/ethtool-4.17/sfc.c 2018-06-13 20:23:09.000000000 +0200 @@ -3083,9 +3083,6 @@ REGISTER_FIELD_BZ(TX_PACE_SB_AF), REGISTER_FIELD_BZ(TX_PACE_SB_NOT_AF), }; -static const struct efx_nic_reg_field efx_nic_reg_fields_TX_PACE_DROP_QID[] = { - REGISTER_FIELD_BZ(TX_PACE_QID_DRP_CNT), -}; static const struct efx_nic_reg_field efx_nic_reg_fields_TX_VLAN[] = { REGISTER_FIELD_BB(TX_VLAN0), REGISTER_FIELD_BB(TX_VLAN0_PORT0_EN),
