From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sat, 13 Aug 2016 23:30:34 +0000 (+0200)
Subject: ip: fix an improper optimization: req.r.rtm_scope may be nonzero here
X-Git-Tag: 1_26_0~307
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=34ecc3b7aefdd6c31e8691bd5485037bbabedbd4;p=oweals%2Fbusybox.git

ip: fix an improper optimization: req.r.rtm_scope may be nonzero here

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index e674e9a0d..48dc6e3d9 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -362,10 +362,9 @@ IF_FEATURE_IP_RULE(ARG_table,)
 		req.r.rtm_scope = RT_SCOPE_NOWHERE;
 
 	if (cmd != RTM_DELROUTE) {
+		req.r.rtm_scope = RT_SCOPE_UNIVERSE;
 		if (RTPROT_BOOT != 0)
 			req.r.rtm_protocol = RTPROT_BOOT;
-		if (RT_SCOPE_UNIVERSE != 0)
-			req.r.rtm_scope = RT_SCOPE_UNIVERSE;
 		if (RTN_UNICAST != 0)
 			req.r.rtm_type = RTN_UNICAST;
 	}