On Thu, 2016-03-17 at 19:09 +0000, Edward Cree wrote: > This series adds support for steering of IPv6 receive flows. > > Changes since v1: > * Fixed and simplified IPv6 address and mask parsing > * Made help text / man page more consistent > * Dropped ethtool-copy.h patch as upstream is now newer
Applied these two, and added the patch below. Thanks for your
patience.
Ben.
---
Change IP parameter syntax in documentation to just 'ip-address'
Writing out the IPv4 address syntax repeatedly is not really
necessary, and extending it to cover IPv6 addresses will just make the
documentation harder to read.
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
ethtool.8.in | 2 +-
ethtool.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ethtool.8.in b/ethtool.8.in
index 36da10ed6c87..9dc5e252a1dc 100644
--- a/ethtool.8.in
+++ b/ethtool.8.in
@@ -54,7 +54,7 @@
.\"
.\" \(*PA - IP address
.\"
-.ds PA \fIx\fP\fB.\fP\fIx\fP\fB.\fP\fIx\fP\fB.\fP\fIx\fP
+.ds PA \fIip-address\fP
.\"
.\" \(*WO - wol flags
.\"
diff --git a/ethtool.c b/ethtool.c
index a92137f7f5b1..d04bf9fedafd 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -4163,8 +4163,8 @@ static const struct option {
" [ src %x:%x:%x:%x:%x:%x [m %x:%x:%x:%x:%x:%x]
]\n"
" [ dst %x:%x:%x:%x:%x:%x [m %x:%x:%x:%x:%x:%x]
]\n"
" [ proto %d [m %x] ]\n"
- " [ src-ip %d.%d.%d.%d [m %d.%d.%d.%d] ]\n"
- " [ dst-ip %d.%d.%d.%d [m %d.%d.%d.%d] ]\n"
+ " [ src-ip IP-ADDRESS [m IP-ADDRESS] ]\n"
+ " [ dst-ip IP-ADDRESS [m IP-ADDRESS] ]\n"
" [ tos %d [m %x] ]\n"
" [ tclass %d [m %x] ]\n"
" [ l4proto %d [m %x] ]\n"
--
Ben Hutchings
compatible: Gracefully accepts erroneous data from any source
signature.asc
Description: This is a digitally signed message part
