On Mon, 2016-02-15 at 15:00 +0000, Edward Cree wrote: > Leaves 'src-ip' and 'dst-ip' documented as taking x.x.x.x, because there's > more low-level nroff here than I can parse, let alone emit. > > Signed-off-by: Edward Cree <ec...@solarflare.com> > --- > ethtool.8.in | 34 +++++++++++++++++++++++++--------- > ethtool.c | 4 +++- > 2 files changed, 28 insertions(+), 10 deletions(-) > > diff --git a/ethtool.8.in b/ethtool.8.in > index eeffa70..5c0a9e3 100644 > --- a/ethtool.8.in > +++ b/ethtool.8.in > @@ -74,7 +74,7 @@ > .\" > .\" \(*NC - Network Classifier type values > .\" > -.ds NC > \fBether\fP|\fBip4\fP|\fBtcp4\fP|\fBudp4\fP|\fBsctp4\fP|\fBah4\fP|\fBesp4\fP > +.ds NC > \fBether\fP|\fBip4\fP|\fBip6\fP|\fBtcp4\fP|\fBudp4\fP|\fBsctp4\fP|\fBah4\fP|\fBesp4\fP|\fBtcp6\fP|\fBudp6\fP|\fBah6\fP|\fBesp6\fP|\fBsctp6\fP
Why is ip6 added in the middle of the IPv4 flow-types here... [...] > @@ -676,11 +678,17 @@ nokeep; > lB l. > ether Ethernet > ip4 Raw IPv4 > +ip6 Raw IPv6 > tcp4 TCP over IPv4 > udp4 UDP over IPv4 > sctp4 SCTP over IPv4 > ah4 IPSEC AH over IPv4 > esp4 IPSEC ESP over IPv4 > +tcp6 TCP over IPv6 > +udp6 UDP over IPv6 > +sctp6 SCTP over IPv6 > +ah6 IPSEC AH over IPv6 > +esp6 IPSEC ESP over IPv6 ...and here... [...] > --- a/ethtool.c > +++ b/ethtool.c > @@ -4108,13 +4108,15 @@ static const struct option { > "Configure Rx network flow classification options or rules", > " rx-flow-hash tcp4|udp4|ah4|esp4|sctp4|" > "tcp6|udp6|ah6|esp6|sctp6 m|v|t|s|d|f|n|r... |\n" > - " flow-type ether|ip4|tcp4|udp4|sctp4|ah4|esp4\n" > + " flow-type ether|ip4|tcp4|udp4|sctp4|ah4|esp4|" > + "ip6|tcp6|udp6|ah6|esp6|sctp6\n" ...but not here? > " [ 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" > " [ tos %d [m %x] ]\n" > + " [ tclass %d [m %x] ]\n" Missing nexthdr? Ben. > " [ l4proto %d [m %x] ]\n" > " [ src-port %d [m %x] ]\n" > " [ dst-port %d [m %x] ]\n" > The information contained in this message is confidential and is > intended for the addressee(s) only. If you have received this message > in error, please notify the sender immediately and delete the > message. Unless you are an addressee (or authorized to receive for an > addressee), you may not use, copy or disclose to anyone this message > or any information contained in this message. The unauthorized use, > disclosure, copying or alteration of this message is strictly > prohibited. -- Ben Hutchings If at first you don't succeed, you're doing about average.
signature.asc
Description: This is a digitally signed message part