]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net/ipv6: Handle onlink flag with multipath routes
authorDavid Ahern <dsahern@gmail.com>
Tue, 20 Mar 2018 17:06:59 +0000 (10:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 Mar 2018 16:40:04 +0000 (12:40 -0400)
For multipath routes the ONLINK flag can be specified per nexthop in
rtnh_flags or globally in rtm_flags. Update ip6_route_multipath_add
to consider the ONLINK setting coming from rtnh_flags. Each loop over
nexthops the config for the sibling route is initialized to the global
config and then per nexthop settings overlayed. The flag is 'or'ed into
fib6_config to handle the ONLINK flag coming from either rtm_flags or
rtnh_flags.

Fixes: 550169ad7e8e ("net/ipv6: Add support for onlink flag")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/route.c

index b3c1137ad0b8dd7ed4981cab7eac5e989a88b48b..b0d5c64e19780ce94feb112285ed1d85dbe07e9e 100644 (file)
@@ -4112,6 +4112,7 @@ static int ip6_route_multipath_add(struct fib6_config *cfg,
                                r_cfg.fc_encap_type = nla_get_u16(nla);
                }
 
+               r_cfg.fc_flags |= (rtnh->rtnh_flags & RTNH_F_ONLINK);
                rt = ip6_route_info_create(&r_cfg, extack);
                if (IS_ERR(rt)) {
                        err = PTR_ERR(rt);