78ae7d8efd
Include upstream patches for gzip, ip & ntpd. Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
17 lines
564 B
Diff
17 lines
564 B
Diff
ip: fix an improper optimization: req.r.rtm_scope may be nonzero here
|
|
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
|
|
|
|
--- 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;
|
|
}
|