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

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

328374dcfea968d9aa709475d4e3fc04b1d073bb
diff --cc tc/f_flower.c
index dfd515258,f39b1f7fd..1555764b9
--- a/tc/f_flower.c
+++ b/tc/f_flower.c
@@@ -25,30 -25,28 +25,29 @@@
  
  static void explain(void)
  {
 -	fprintf(stderr, "Usage: ... flower [ MATCH-LIST ]\n");
 -	fprintf(stderr, "                  [ skip_sw | skip_hw ]\n");
 -	fprintf(stderr, "                  [ action ACTION-SPEC ] [ classid CLASSID ]\n");
 -	fprintf(stderr, "\n");
 -	fprintf(stderr, "Where: MATCH-LIST := [ MATCH-LIST ] MATCH\n");
 -	fprintf(stderr, "       MATCH      := { indev DEV-NAME |\n");
 -	fprintf(stderr, "                       vlan_id VID |\n");
 -	fprintf(stderr, "                       vlan_prio PRIORITY |\n");
 -	fprintf(stderr, "                       vlan_ethtype [ ipv4 | ipv6 | ETH-TYPE ] |\n");
 -	fprintf(stderr, "                       dst_mac MAC-ADDR |\n");
 -	fprintf(stderr, "                       src_mac MAC-ADDR |\n");
 -	fprintf(stderr, "                       ip_proto [tcp | udp | IP-PROTO ] |\n");
 -	fprintf(stderr, "                       dst_ip [ IPV4-ADDR | IPV6-ADDR ] |\n");
 -	fprintf(stderr, "                       src_ip [ IPV4-ADDR | IPV6-ADDR ] |\n");
 -	fprintf(stderr, "                       dst_port PORT-NUMBER |\n");
 -	fprintf(stderr, "                       src_port PORT-NUMBER }\n");
 -	fprintf(stderr,	"       FILTERID := X:Y:Z\n");
 -	fprintf(stderr,	"       ACTION-SPEC := ... look at individual actions\n");
 -	fprintf(stderr,	"\n");
 -	fprintf(stderr,	"NOTE: CLASSID, IP-PROTO are parsed as hexadecimal input.\n");
 -	fprintf(stderr,	"NOTE: There can be only used one mask per one prio. If user needs\n");
 -	fprintf(stderr,	"      to specify different mask, he has to use different prio.\n");
 +	fprintf(stderr,
 +		"Usage: ... flower [ MATCH-LIST ]\n"
 +		"                  [ skip_sw | skip_hw ]\n"
 +		"                  [ action ACTION-SPEC ] [ classid CLASSID ]\n"
 +		"\n"
 +		"Where: MATCH-LIST := [ MATCH-LIST ] MATCH\n"
 +		"       MATCH      := { indev DEV-NAME |\n"
 +		"                       vlan_id VID |\n"
 +		"                       vlan_prio PRIORITY |\n"
 +		"                       vlan_ethtype [ ipv4 | ipv6 | ETH-TYPE ] |\n"
 +		"                       dst_mac MAC-ADDR |\n"
 +		"                       src_mac MAC-ADDR |\n"
- 		"                       [ipv4 | ipv6 ] |\n"
 +		"                       ip_proto [tcp | udp | IP-PROTO ] |\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"
 +		"       FILTERID := X:Y:Z\n"
 +		"       ACTION-SPEC := ... look at individual actions\n"
 +		"\n"
- 		"NOTE: CLASSID, ETH-TYPE, IP-PROTO are parsed as hexadecimal input.\n"
++		"NOTE: CLASSID, IP-PROTO are parsed as hexadecimal input.\n"
 +		"NOTE: There can be only used one mask per one prio. If user needs\n"
 +		"      to specify different mask, he has to use different prio.\n");
  }
  
  static int flower_parse_eth_addr(char *str, int addr_type, int mask_type,