Hello community,
here is the log from the commit of package ethtool for openSUSE:Factory checked
in at 2017-11-01 11:06:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ethtool (Old)
and /work/SRC/openSUSE:Factory/.ethtool.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ethtool"
Wed Nov 1 11:06:48 2017 rev:48 rq:537513 version:4.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/ethtool/ethtool.changes 2017-06-17
10:19:43.443387875 +0200
+++ /work/SRC/openSUSE:Factory/.ethtool.new/ethtool.changes 2017-11-01
11:06:53.791782531 +0100
@@ -1,0 +2,12 @@
+Mon Oct 30 09:17:17 UTC 2017 - mkube...@suse.cz
+
+- Update to new upstream release 4.13
+ * Feature: add support for HWTSTAMP_FILTER_NTP_ALL
+ * Feature: Add DMA Coalescing support
+ * Feature: Remove UDP Fragmentation Offload error prints
+ * Feature: stmmac: Add DMA HW Feature Register
+ * Fix: Do not return error code if no changes were attempted.
+ * Fix: Fix formatting of advertise bitmask
+ * Fix: fix the rx vs tx mixup in set channel message
+
+-------------------------------------------------------------------
Old:
----
ethtool-4.11.tar.sign
ethtool-4.11.tar.xz
New:
----
ethtool-4.13.tar.sign
ethtool-4.13.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ethtool.spec ++++++
--- /var/tmp/diff_new_pack.GthP1O/_old 2017-11-01 11:06:55.203730952 +0100
+++ /var/tmp/diff_new_pack.GthP1O/_new 2017-11-01 11:06:55.203730952 +0100
@@ -17,7 +17,7 @@
Name: ethtool
-Version: 4.11
+Version: 4.13
Release: 0
Summary: Examine and Tune Ethernet-Based Network Interfaces
License: GPL-2.0
++++++ ethtool-4.11.tar.xz -> ethtool-4.13.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.11/Makefile.in new/ethtool-4.13/Makefile.in
--- old/ethtool-4.11/Makefile.in 2017-06-02 19:44:53.000000000 +0200
+++ new/ethtool-4.13/Makefile.in 2017-10-27 20:11:24.000000000 +0200
@@ -2069,7 +2069,7 @@
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
>$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c
>$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
@@ -2095,7 +2095,7 @@
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
@@ -2113,7 +2113,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -2123,7 +2123,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.11/NEWS new/ethtool-4.13/NEWS
--- old/ethtool-4.11/NEWS 2017-06-02 19:43:27.000000000 +0200
+++ new/ethtool-4.13/NEWS 2017-10-27 20:04:48.000000000 +0200
@@ -1,4 +1,17 @@
+Version 4.13 - October 27, 2017
+
+ * Fix: Do not return error code if no changes were attempted.
+ * Fix: Fix formatting of advertise bitmask
+ * Feature: Document 56000 advertise link modes
+ * Fix: fix the rx vs tx mixup in set channel message
+ * Feature: add support for HWTSTAMP_FILTER_NTP_ALL
+ * Feature: Add DMA Coalescing support
+ * Feature: Remove UDP Fragmentation Offload error prints
+ * Feature: stmmac: Add macros for number of registers
+ * Feature: stmmac: Add DMA HW Feature Register
+
Version 4.11 - June 2, 2017
+
* Feature: Support for configurable RSS hash function
* Feature: support queue and VF fields for rxclass filters
* Feature: Add support for 2500baseT/5000baseT link modes
@@ -11,7 +24,6 @@
* Feature: Implement ETHTOOL_PHY_GTUNABLE/ETHTOOL_PHY_STUNABLE and PHY
downshift
* Feature: add register dump support for fjes driver (-d option)
-
Version 4.8 - October 3, 2016
* Feature: QSFP Plus/QSFP28 Diagnostics Information Support
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.11/configure new/ethtool-4.13/configure
--- old/ethtool-4.11/configure 2017-06-02 19:44:53.000000000 +0200
+++ new/ethtool-4.13/configure 2017-10-27 20:11:24.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.11.
+# Generated by GNU Autoconf 2.69 for ethtool 4.13.
#
# Report bugs to <net...@vger.kernel.org>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='ethtool'
PACKAGE_TARNAME='ethtool'
-PACKAGE_VERSION='4.11'
-PACKAGE_STRING='ethtool 4.11'
+PACKAGE_VERSION='4.13'
+PACKAGE_STRING='ethtool 4.13'
PACKAGE_BUGREPORT='net...@vger.kernel.org'
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.11 to adapt to many kinds of systems.
+\`configure' configures ethtool 4.13 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.11:";;
+ short | recursive ) echo "Configuration of ethtool 4.13:";;
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.11
+ethtool configure 4.13
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.11, which was
+It was created by ethtool $as_me 4.13, 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.11'
+ VERSION='4.13'
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.11, which was
+This file was extended by ethtool $as_me 4.13, 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.11
+ethtool config.status 4.13
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.11/configure.ac
new/ethtool-4.13/configure.ac
--- old/ethtool-4.11/configure.ac 2017-06-02 19:38:24.000000000 +0200
+++ new/ethtool-4.13/configure.ac 2017-10-27 19:58:59.000000000 +0200
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(ethtool, 4.11, net...@vger.kernel.org)
+AC_INIT(ethtool, 4.13, net...@vger.kernel.org)
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.11/ethtool-copy.h
new/ethtool-4.13/ethtool-copy.h
--- old/ethtool-4.11/ethtool-copy.h 2017-06-02 19:27:13.000000000 +0200
+++ new/ethtool-4.13/ethtool-copy.h 2017-10-26 20:02:15.000000000 +0200
@@ -400,6 +400,7 @@
* a TX interrupt, when the packet rate is above @pkt_rate_high.
* @rate_sample_interval: How often to do adaptive coalescing packet rate
* sampling, measured in seconds. Must not be zero.
+ * @dmac: How many usecs to store packets before moving to host memory.
*
* Each pair of (usecs, max_frames) fields specifies that interrupts
* should be coalesced until
@@ -450,6 +451,7 @@
__u32 tx_coalesce_usecs_high;
__u32 tx_max_coalesced_frames_high;
__u32 rate_sample_interval;
+ __u32 dmac;
};
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.11/ethtool.8 new/ethtool-4.13/ethtool.8
--- old/ethtool-4.11/ethtool.8 2017-06-02 19:44:55.000000000 +0200
+++ new/ethtool-4.13/ethtool.8 2017-10-27 20:11:25.000000000 +0200
@@ -113,7 +113,7 @@
. hy \\n(HY
..
.
-.TH ETHTOOL 8 "June 2017" "Ethtool version 4.11"
+.TH ETHTOOL 8 "October 2017" "Ethtool version 4.13"
.SH NAME
ethtool \- query or control network driver and hardware settings
.
@@ -165,6 +165,7 @@
.BN tx\-usecs\-high
.BN tx\-frames\-high
.BN sample\-interval
+.BN dmac
.HP
.B ethtool \-g|\-\-show\-ring
.I devname
@@ -590,9 +591,9 @@
0x020 1000baseT Full
0x20000 1000baseKX Full
0x20000000000 1000baseX Full
-0x800000000000 2500baseT Full
-0x8000 2500baseX Full (not supported by IEEE standards)'
-0x1000000000000 5000baseT Full
+0x800000000000 2500baseT Full
+0x8000 2500baseX Full (not supported by IEEE standards)
+0x1000000000000 5000baseT Full
0x1000 10000baseT Full
0x40000 10000baseKX4 Full
0x80000 10000baseKR Full
@@ -613,6 +614,10 @@
0x400000000 50000baseCR2 Full
0x800000000 50000baseKR2 Full
0x10000000000 50000baseSR2 Full
+0x8000000 56000baseKR4 Full
+0x10000000 56000baseCR4 Full
+0x20000000 56000baseSR4 Full
+0x40000000 56000baseLR4 Full
0x1000000000 100000baseKR4 Full
0x2000000000 100000baseSR4 Full
0x4000000000 100000baseCR4 Full
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.11/ethtool.8.in
new/ethtool-4.13/ethtool.8.in
--- old/ethtool-4.11/ethtool.8.in 2017-06-02 19:39:13.000000000 +0200
+++ new/ethtool-4.13/ethtool.8.in 2017-10-27 19:59:44.000000000 +0200
@@ -113,7 +113,7 @@
. hy \\n(HY
..
.
-.TH ETHTOOL 8 "June 2017" "Ethtool version @VERSION@"
+.TH ETHTOOL 8 "October 2017" "Ethtool version @VERSION@"
.SH NAME
ethtool \- query or control network driver and hardware settings
.
@@ -165,6 +165,7 @@
.BN tx\-usecs\-high
.BN tx\-frames\-high
.BN sample\-interval
+.BN dmac
.HP
.B ethtool \-g|\-\-show\-ring
.I devname
@@ -590,9 +591,9 @@
0x020 1000baseT Full
0x20000 1000baseKX Full
0x20000000000 1000baseX Full
-0x800000000000 2500baseT Full
-0x8000 2500baseX Full (not supported by IEEE standards)'
-0x1000000000000 5000baseT Full
+0x800000000000 2500baseT Full
+0x8000 2500baseX Full (not supported by IEEE standards)
+0x1000000000000 5000baseT Full
0x1000 10000baseT Full
0x40000 10000baseKX4 Full
0x80000 10000baseKR Full
@@ -613,6 +614,10 @@
0x400000000 50000baseCR2 Full
0x800000000 50000baseKR2 Full
0x10000000000 50000baseSR2 Full
+0x8000000 56000baseKR4 Full
+0x10000000 56000baseCR4 Full
+0x20000000 56000baseSR4 Full
+0x40000000 56000baseLR4 Full
0x1000000000 100000baseKR4 Full
0x2000000000 100000baseSR4 Full
0x4000000000 100000baseCR4 Full
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.11/ethtool.c new/ethtool-4.13/ethtool.c
--- old/ethtool-4.11/ethtool.c 2017-06-02 19:27:13.000000000 +0200
+++ new/ethtool-4.13/ethtool.c 2017-10-26 20:05:04.000000000 +0200
@@ -1337,6 +1337,7 @@
"sample-interval: %u\n"
"pkt-rate-low: %u\n"
"pkt-rate-high: %u\n"
+ "dmac: %u\n"
"\n"
"rx-usecs: %u\n"
"rx-frames: %u\n"
@@ -1362,6 +1363,7 @@
ecoal->rate_sample_interval,
ecoal->pkt_rate_low,
ecoal->pkt_rate_high,
+ ecoal->dmac,
ecoal->rx_coalesce_usecs,
ecoal->rx_max_coalesced_frames,
@@ -1589,7 +1591,7 @@
"one-step-sync (HWTSTAMP_TX_ONESTEP_SYNC)",
};
-#define N_RX_FILTERS (HWTSTAMP_FILTER_PTP_V2_DELAY_REQ + 1)
+#define N_RX_FILTERS (HWTSTAMP_FILTER_NTP_ALL + 1)
static char *rx_filter_labels[N_RX_FILTERS] = {
"none (HWTSTAMP_FILTER_NONE)",
@@ -1607,6 +1609,7 @@
"ptpv2-event (HWTSTAMP_FILTER_PTP_V2_EVENT)",
"ptpv2-sync (HWTSTAMP_FILTER_PTP_V2_SYNC)",
"ptpv2-delay-req (HWTSTAMP_FILTER_PTP_V2_DELAY_REQ)",
+ "ntp-all (HWTSTAMP_FILTER_NTP_ALL)",
};
static int dump_tsinfo(const struct ethtool_ts_info *info)
@@ -1994,12 +1997,12 @@
&changed);
if (!changed) {
- fprintf(stderr, "no channel parameters changed, aborting\n");
- fprintf(stderr, "current values: tx %u rx %u other %u"
+ fprintf(stderr, "no channel parameters changed.\n");
+ fprintf(stderr, "current values: rx %u tx %u other %u"
" combined %u\n", echannels.rx_count,
echannels.tx_count, echannels.other_count,
echannels.combined_count);
- return 1;
+ return 0;
}
echannels.cmd = ETHTOOL_SCHANNELS;
@@ -2068,6 +2071,7 @@
int coal_adaptive_rx_wanted = -1;
int coal_adaptive_tx_wanted = -1;
s32 coal_sample_rate_wanted = -1;
+ s32 coal_dmac_wanted = -1;
s32 coal_pkt_rate_low_wanted = -1;
s32 coal_pkt_rate_high_wanted = -1;
s32 coal_rx_usec_wanted = -1;
@@ -2093,6 +2097,8 @@
&ecoal.use_adaptive_tx_coalesce },
{ "sample-interval", CMDL_S32, &coal_sample_rate_wanted,
&ecoal.rate_sample_interval },
+ { "dmac", CMDL_S32, &coal_dmac_wanted,
+ &ecoal.dmac },
{ "stats-block-usecs", CMDL_S32, &coal_stats_wanted,
&ecoal.stats_block_coalesce_usecs },
{ "pkt-rate-low", CMDL_S32, &coal_pkt_rate_low_wanted,
@@ -2186,6 +2192,10 @@
eval.cmd = off_flag_def[i].get_cmd;
err = send_ioctl(ctx, &eval);
if (err) {
+ if (errno == EOPNOTSUPP &&
+ off_flag_def[i].get_cmd == ETHTOOL_GUFO)
+ continue;
+
fprintf(stderr,
"Cannot get device %s settings: %m\n",
off_flag_def[i].long_name);
@@ -4784,7 +4794,8 @@
" [rx-frames-high N]\n"
" [tx-usecs-high N]\n"
" [tx-frames-high N]\n"
- " [sample-interval N]\n" },
+ " [sample-interval N]\n"
+ " [dmac N]\n" },
{ "-g|--show-ring", 1, do_gring, "Query RX/TX ring parameters" },
{ "-G|--set-ring", 1, do_sring, "Set RX/TX ring parameters",
" [ rx N ]\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.11/ethtool.spec
new/ethtool-4.13/ethtool.spec
--- old/ethtool-4.11/ethtool.spec 2017-06-02 19:44:55.000000000 +0200
+++ new/ethtool-4.13/ethtool.spec 2017-10-27 20:11:26.000000000 +0200
@@ -1,5 +1,5 @@
Name : ethtool
-Version : 4.11
+Version : 4.13
Release : 1
Group : Utilities
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.11/net_tstamp-copy.h
new/ethtool-4.13/net_tstamp-copy.h
--- old/ethtool-4.11/net_tstamp-copy.h 2016-08-24 21:47:26.000000000 +0200
+++ new/ethtool-4.13/net_tstamp-copy.h 2017-10-26 20:02:15.000000000 +0200
@@ -9,6 +9,7 @@
#ifndef _NET_TIMESTAMPING_H
#define _NET_TIMESTAMPING_H
+#include <linux/types.h>
#include <linux/socket.h> /* for SO_TIMESTAMPING */
/* SO_TIMESTAMPING gets an integer bit field comprised of these values */
@@ -20,23 +21,42 @@
SOF_TIMESTAMPING_SOFTWARE = (1<<4),
SOF_TIMESTAMPING_SYS_HARDWARE = (1<<5),
SOF_TIMESTAMPING_RAW_HARDWARE = (1<<6),
- SOF_TIMESTAMPING_MASK =
- (SOF_TIMESTAMPING_RAW_HARDWARE - 1) |
- SOF_TIMESTAMPING_RAW_HARDWARE
+ SOF_TIMESTAMPING_OPT_ID = (1<<7),
+ SOF_TIMESTAMPING_TX_SCHED = (1<<8),
+ SOF_TIMESTAMPING_TX_ACK = (1<<9),
+ SOF_TIMESTAMPING_OPT_CMSG = (1<<10),
+ SOF_TIMESTAMPING_OPT_TSONLY = (1<<11),
+ SOF_TIMESTAMPING_OPT_STATS = (1<<12),
+ SOF_TIMESTAMPING_OPT_PKTINFO = (1<<13),
+ SOF_TIMESTAMPING_OPT_TX_SWHW = (1<<14),
+
+ SOF_TIMESTAMPING_LAST = SOF_TIMESTAMPING_OPT_TX_SWHW,
+ SOF_TIMESTAMPING_MASK = (SOF_TIMESTAMPING_LAST - 1) |
+ SOF_TIMESTAMPING_LAST
};
+/*
+ * SO_TIMESTAMPING flags are either for recording a packet timestamp or for
+ * reporting the timestamp to user space.
+ * Recording flags can be set both via socket options and control messages.
+ */
+#define SOF_TIMESTAMPING_TX_RECORD_MASK (SOF_TIMESTAMPING_TX_HARDWARE |
\
+ SOF_TIMESTAMPING_TX_SOFTWARE | \
+ SOF_TIMESTAMPING_TX_SCHED | \
+ SOF_TIMESTAMPING_TX_ACK)
+
/**
- * struct hwtstamp_config - %SIOCSHWTSTAMP parameter
+ * struct hwtstamp_config - %SIOCGHWTSTAMP and %SIOCSHWTSTAMP parameter
*
- * @flags: no flags defined right now, must be zero
+ * @flags: no flags defined right now, must be zero for %SIOCSHWTSTAMP
* @tx_type: one of HWTSTAMP_TX_*
- * @rx_type: one of one of HWTSTAMP_FILTER_*
+ * @rx_filter: one of HWTSTAMP_FILTER_*
*
- * %SIOCSHWTSTAMP expects a &struct ifreq with a ifr_data pointer to
- * this structure. dev_ifsioc() in the kernel takes care of the
- * translation between 32 bit userspace and 64 bit kernel. The
- * structure is intentionally chosen so that it has the same layout on
- * 32 and 64 bit systems, don't break this!
+ * %SIOCGHWTSTAMP and %SIOCSHWTSTAMP expect a &struct ifreq with a
+ * ifr_data pointer to this structure. For %SIOCSHWTSTAMP, if the
+ * driver or hardware does not support the requested @rx_filter value,
+ * the driver may use a more general filter mode. In this case
+ * @rx_filter will indicate the actual mode on return.
*/
struct hwtstamp_config {
int flags;
@@ -108,6 +128,16 @@
HWTSTAMP_FILTER_PTP_V2_SYNC,
/* PTP v2/802.AS1, any layer, Delay_req packet */
HWTSTAMP_FILTER_PTP_V2_DELAY_REQ,
+
+ /* NTP, UDP, all versions and packet modes */
+ HWTSTAMP_FILTER_NTP_ALL,
+};
+
+/* SCM_TIMESTAMPING_PKTINFO control message */
+struct scm_ts_pktinfo {
+ __u32 if_index;
+ __u32 pkt_length;
+ __u32 reserved[2];
};
#endif /* _NET_TIMESTAMPING_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.11/stmmac.c new/ethtool-4.13/stmmac.c
--- old/ethtool-4.11/stmmac.c 2016-08-24 21:47:26.000000000 +0200
+++ new/ethtool-4.13/stmmac.c 2017-10-26 20:02:15.000000000 +0200
@@ -14,6 +14,10 @@
#include <string.h>
#include "internal.h"
+#define MAC100_DMA_REG_NUM 9
+#define GMAC_REG_NUM 55
+#define GMAC_DMA_REG_NUM 23
+
int st_mac100_dump_regs(struct ethtool_drvinfo *info,
struct ethtool_regs *regs)
{
@@ -36,7 +40,7 @@
fprintf(stdout, "\n");
fprintf(stdout, "DMA Registers\n");
- for (i = 0; i < 9; i++)
+ for (i = 0; i < MAC100_DMA_REG_NUM; i++)
fprintf(stdout, "CSR%d 0x%08X\n", i, *stmmac_reg++);
fprintf(stdout, "DMA cur tx buf addr 0x%08X\n", *stmmac_reg++);
@@ -54,12 +58,12 @@
fprintf(stdout, "ST GMAC Registers\n");
fprintf(stdout, "GMAC Registers\n");
- for (i = 0; i < 55; i++)
+ for (i = 0; i < GMAC_REG_NUM; i++)
fprintf(stdout, "Reg%d 0x%08X\n", i, *stmmac_reg++);
fprintf(stdout, "\n");
fprintf(stdout, "DMA Registers\n");
- for (i = 0; i < 22; i++)
+ for (i = 0; i < GMAC_DMA_REG_NUM; i++)
fprintf(stdout, "Reg%d 0x%08X\n", i, *stmmac_reg++);
return 0;
