From: Stephen Hemminger <shemming@brocade.com>
Date: Fri, 14 Aug 2015 02:42:41 +0000 (-0700)
Subject: Merge branch 'master' into net-next
X-Git-Tag: v4.3.0~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a6422c2438d60d9ecedac27d813f4c3fb44a7da;p=thirdparty%2Fiproute2.git

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

9a6422c2438d60d9ecedac27d813f4c3fb44a7da
diff --cc ip/iplink_bridge.c
index a8bc84067,61e4cdaba..f1c6968d8
--- a/ip/iplink_bridge.c
+++ b/ip/iplink_bridge.c
@@@ -80,20 -74,10 +75,19 @@@ static int bridge_parse_opt(struct link
  			__u16 prio;
  
  			NEXT_ARG();
- 			if (get_u16(&prio, *argv, 0)) {
+ 			if (get_u16(&prio, *argv, 0))
  				invarg("invalid priority", *argv);
- 				return -1;
- 			}
+ 
  			addattr16(n, 1024, IFLA_BR_PRIORITY, prio);
 +		} else if (matches(*argv, "vlan_filtering") == 0) {
 +			__u8 vlan_filter;
 +
 +			NEXT_ARG();
 +			if (get_u8(&vlan_filter, *argv, 0)) {
 +				invarg("invalid vlan_filtering", *argv);
 +				return -1;
 +			}
 +			addattr8(n, 1024, IFLA_BR_VLAN_FILTERING, vlan_filter);
  		} else if (matches(*argv, "help") == 0) {
  			explain();
  			return -1;