From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 29 Dec 2016 18:31:44 +0000 (-0800)
Subject: Merge branch 'master' into net-next
X-Git-Tag: v4.11.0~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d34adf67b543d47a08ba27aa80833053268f3526;p=thirdparty%2Fiproute2.git

Merge branch 'master' into net-next
---

d34adf67b543d47a08ba27aa80833053268f3526
diff --cc tc/f_flower.c
index 6d9a3b70a,71e9515f5..4d305b6e1
--- a/tc/f_flower.c
+++ b/tc/f_flower.c
@@@ -53,12 -53,12 +53,13 @@@ static void explain(void
  		"                       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_key_id [ KEY-ID ] }\n"
+ 		"                       code ICMP-CODE |\n"
+ 		"                       enc_dst_ip [ IPV4-ADDR | IPV6-ADDR ] |\n"
+ 		"                       enc_src_ip [ IPV4-ADDR | IPV6-ADDR ] |\n"
+ 		"                       enc_key_id [ KEY-ID ] |\n"
+ 		"                       enc_dst_port [ UDP-PORT ] }\n"
  		"       FILTERID := X:Y:Z\n"
 +		"       MASKED_LLADDR := { LLADDR | LLADDR/MASK | LLADDR/BITS }\n"
  		"       ACTION-SPEC := ... look at individual actions\n"
  		"\n"
  		"NOTE: CLASSID, IP-PROTO are parsed as hexadecimal input.\n"