From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 22 Dec 2016 00:06:35 +0000 (-0800)
Subject: Revert "tc: flower: document that *_ip parameters take a PREFIX as an argument."
X-Git-Tag: v4.10.0~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10da552800d761fff60eabc067f599c4e403403a;p=thirdparty%2Fiproute2.git

Revert "tc: flower: document that *_ip parameters take a PREFIX as an argument."

This reverts commit a8a1dccd2af957077aa9d975db979c39d571bb6c.
---

diff --git a/man/man8/tc-flower.8 b/man/man8/tc-flower.8
index 331049636..bc488523e 100644
--- a/man/man8/tc-flower.8
+++ b/man/man8/tc-flower.8
@@ -31,8 +31,8 @@ flower \- flow based traffic control filter
 .IR ETH_TYPE " } | "
 .BR ip_proto " { " tcp " | " udp " | " sctp " | " icmp " | " icmpv6 " | "
 .IR IP_PROTO " } | { "
-.BR dst_ip " | " src_ip " } "
-.IR PREFIX " | { "
+.BR dst_ip " | " src_ip " } { "
+.IR ipv4_address " | " ipv6_address " } | { "
 .BR dst_port " | " src_port " } "
 .IR port_number " } | "
 .B enc_key_id
@@ -108,14 +108,14 @@ may be
 .BR tcp ", " udp ", " sctp ", " icmp ", " icmpv6
 or an unsigned 8bit value in hexadecimal format.
 .TP
-.BI dst_ip " PREFIX"
+.BI dst_ip " ADDRESS"
 .TQ
-.BI src_ip " PREFIX"
+.BI src_ip " ADDRESS"
 Match on source or destination IP address.
-.I PREFIX
-must be a valid IPv4 or IPv6 address, depending on the \fBprotocol\fR
-option to tc filter, optionally followed by a slash and the prefix length.
-If the prefix is missing, \fBtc\fR assumes a full-length host match.
+.I ADDRESS
+must be a valid IPv4 or IPv6 address, depending on
+.BR protocol
+option of tc filter.
 .TP
 .BI dst_port " NUMBER"
 .TQ
@@ -133,16 +133,16 @@ which have to be specified in beforehand.
 .TP
 .BI enc_key_id " NUMBER"
 .TQ
-.BI enc_dst_ip " PREFIX"
+.BI enc_dst_ip " ADDRESS"
 .TQ
-.BI enc_src_ip " PREFIX"
+.BI enc_src_ip " ADDRESS"
+.TQ
+.BI enc_dst_port " NUMBER"
 Match on IP tunnel metadata. Key id
 .I NUMBER
 is a 32 bit tunnel key id (e.g. VNI for VXLAN tunnel).
-.I PREFIX
-must be a valid IPv4 or IPv6 address optionally followed by a slash and the
-prefix length. If the prefix is missing, \fBtc\fR assumes a full-length
-host match.  Dst port
+.I ADDRESS
+must be a valid IPv4 or IPv6 address. Dst port
 .I NUMBER
 is a 16 bit UDP dst port.
 .SH NOTES
diff --git a/tc/f_flower.c b/tc/f_flower.c
index 6d9a3b70a..df73bb28c 100644
--- a/tc/f_flower.c
+++ b/tc/f_flower.c
@@ -48,14 +48,14 @@ static void explain(void)
 		"                       dst_mac MASKED-LLADDR |\n"
 		"                       src_mac MASKED-LLADDR |\n"
 		"                       ip_proto [tcp | udp | sctp | icmp | icmpv6 | IP-PROTO ] |\n"
-		"                       dst_ip PREFIX |\n"
-		"                       src_ip PREFIX |\n"
+		"                       dst_ip [ IPV4-ADDR | IPV6-ADDR ] |\n"
+		"                       src_ip [ IPV4-ADDR | IPV6-ADDR ] |\n"
 		"                       dst_port PORT-NUMBER |\n"
 		"                       src_port PORT-NUMBER |\n"
 		"                       type ICMP-TYPE |\n"
 		"                       code ICMP-CODE }\n"
-		"                       enc_dst_ip PREFIX |\n"
-		"                       enc_src_ip PREFIX |\n"
+		"                       enc_dst_ip [ IPV4-ADDR | IPV6-ADDR ] |\n"
+		"                       enc_src_ip [ IPV4-ADDR | IPV6-ADDR ] |\n"
 		"                       enc_key_id [ KEY-ID ] }\n"
 		"       FILTERID := X:Y:Z\n"
 		"       MASKED_LLADDR := { LLADDR | LLADDR/MASK | LLADDR/BITS }\n"