From: Stephen Hemminger <shemming@brocade.com>
Date: Mon, 31 Aug 2015 23:32:10 +0000 (-0700)
Subject: Merge branch 'master' into net-next
X-Git-Tag: v4.3.0~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1e225beef61b2d8d3df79cbb86ba72ca97097de;p=thirdparty%2Fiproute2.git

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

f1e225beef61b2d8d3df79cbb86ba72ca97097de
diff --cc ip/iplink.c
index 8bc9f4976,5361c2f9f..97f46cdee
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@@ -613,22 -633,10 +634,22 @@@ int iplink_parse(int argc, char **argv
  				invarg("Invalid \"link-netnsid\" value\n", *argv);
  			addattr32(&req->n, sizeof(*req), IFLA_LINK_NETNSID,
  				  link_netnsid);
 +		} else if (strcmp(*argv, "protodown") == 0) {
 +			unsigned int proto_down;
 +
 +			NEXT_ARG();
 +			if (strcmp(*argv, "on") == 0)
 +				proto_down = 1;
 +			else if (strcmp(*argv, "off") == 0)
 +				proto_down = 0;
 +			else
 +				return on_off("protodown", *argv);
 +			addattr8(&req->n, sizeof(*req), IFLA_PROTO_DOWN,
 +				 proto_down);
  		} else {
- 			if (strcmp(*argv, "dev") == 0) {
+ 			if (strcmp(*argv, "dev") == 0)
  				NEXT_ARG();
- 			}
+ 
  			if (matches(*argv, "help") == 0)
  				usage();
  			if (*dev)