From: Stephen Hemminger <shemming@brocade.com>
Date: Mon, 19 Oct 2015 04:58:29 +0000 (-0700)
Subject: Merge branch 'master' into net-next
X-Git-Tag: v4.4.0~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b89c359c15b7b20f153813aabfc62071bc6f94a8;p=thirdparty%2Fiproute2.git

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

b89c359c15b7b20f153813aabfc62071bc6f94a8
diff --cc ip/iproute.c
index ce90895b1,b137f555d..8e4022b2d
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@@ -1671,10 -1642,8 +1671,10 @@@ static int iproute_get(int argc, char *
  	if (req.r.rtm_family == AF_UNSPEC)
  		req.r.rtm_family = AF_INET;
  
 +	req.r.rtm_flags |= RTM_F_LOOKUP_TABLE;
 +
  	if (rtnl_talk(&rth, &req.n, &req.n, sizeof(req)) < 0)
- 		exit(2);
+ 		return -2;
  
  	if (connected && !from_ok) {
  		struct rtmsg *r = NLMSG_DATA(&req.n);