From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 30 Jan 2017 04:30:05 +0000 (-0800)
Subject: Merge branch 'master' into net-next
X-Git-Tag: v4.11.0~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fefc93bb28010f59a423d094476943b963f66433;p=thirdparty%2Fiproute2.git

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

fefc93bb28010f59a423d094476943b963f66433
diff --cc tc/f_flower.c
index a6c0e1cda,145a85666..403100c92
--- a/tc/f_flower.c
+++ b/tc/f_flower.c
@@@ -759,19 -529,11 +759,21 @@@ parse_done
  	if (ret)
  		return ret;
  
 +	if (mtf_mask) {
 +		ret = addattr32(n, MAX_MSG, TCA_FLOWER_KEY_FLAGS, htonl(mtf));
 +		if (ret)
 +			return ret;
 +
 +		ret = addattr32(n, MAX_MSG, TCA_FLOWER_KEY_FLAGS_MASK, htonl(mtf_mask));
 +		if (ret)
 +			return ret;
 +	}
 +
- 	ret = addattr16(n, MAX_MSG, TCA_FLOWER_KEY_ETH_TYPE, eth_type);
- 	if (ret)
- 		return ret;
+ 	if (eth_type != htons(ETH_P_ALL)) {
+ 		ret = addattr16(n, MAX_MSG, TCA_FLOWER_KEY_ETH_TYPE, eth_type);
+ 		if (ret)
+ 			return ret;
+ 	}
  
  	tail->rta_len = (((void *)n)+n->nlmsg_len) - (void *)tail;