p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipv6: Change rt6_add_nexthop and rt6_nexthop_info to take fib6_nh 

rt6_add_nexthop and rt6_nexthop_info only need the fib6_info for the
gateway flag and the nexthop weight, and the presence of a gateway is now
per-nexthop. Update the signatures to take a fib6_nh and nexthop weight
and better align with the ipv4 versions.

Signed-off-by: David Ahern <dsahern@gmail.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern 2019-03-27 20:53:54 -07:00 committed by David S. Miller
parent 6d3d07b45c
commit 572bf4dd71
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
net/ipv6/route.c
View File

@ -4583,37 +4583,37 @@ static size_t rt6_nlmsg_size(struct fib6_info *rt)
+ nexthop_len;
}
static int rt6_nexthop_info(struct sk_buff *skb, struct fib6_info *rt,
static int rt6_nexthop_info(struct sk_buff *skb, const struct fib6_nh *fib6_nh,
unsigned int *flags, bool skip_oif)
{
if (rt->fib6_nh.nh_flags & RTNH_F_DEAD)
if (fib6_nh->nh_flags & RTNH_F_DEAD)
*flags |= RTNH_F_DEAD;
if (rt->fib6_nh.nh_flags & RTNH_F_LINKDOWN) {
if (fib6_nh->nh_flags & RTNH_F_LINKDOWN) {
*flags |= RTNH_F_LINKDOWN;
rcu_read_lock();
if (ip6_ignore_linkdown(rt->fib6_nh.nh_dev))
if (ip6_ignore_linkdown(fib6_nh->nh_dev))
*flags |= RTNH_F_DEAD;
rcu_read_unlock();
}
if (rt->fib6_nh.fib_nh_has_gw) {
if (nla_put_in6_addr(skb, RTA_GATEWAY, &rt->fib6_nh.nh_gw) < 0)
if (fib6_nh->fib_nh_has_gw) {
if (nla_put_in6_addr(skb, RTA_GATEWAY, &fib6_nh->nh_gw) < 0)
goto nla_put_failure;
}
*flags |= (rt->fib6_nh.nh_flags & RTNH_F_ONLINK);
if (rt->fib6_nh.nh_flags & RTNH_F_OFFLOAD)
*flags |= (fib6_nh->nh_flags & RTNH_F_ONLINK);
if (fib6_nh->nh_flags & RTNH_F_OFFLOAD)
*flags |= RTNH_F_OFFLOAD;
/* not needed for multipath encoding b/c it has a rtnexthop struct */
if (!skip_oif && rt->fib6_nh.nh_dev &&
nla_put_u32(skb, RTA_OIF, rt->fib6_nh.nh_dev->ifindex))
if (!skip_oif && fib6_nh->nh_dev &&
nla_put_u32(skb, RTA_OIF, fib6_nh->nh_dev->ifindex))
goto nla_put_failure;
if (rt->fib6_nh.nh_lwtstate &&
lwtunnel_fill_encap(skb, rt->fib6_nh.nh_lwtstate) < 0)
if (fib6_nh->nh_lwtstate &&
lwtunnel_fill_encap(skb, fib6_nh->nh_lwtstate) < 0)
goto nla_put_failure;
return 0;
@ -4623,9 +4623,9 @@ static int rt6_nexthop_info(struct sk_buff *skb, struct fib6_info *rt,
}
/* add multipath next hop */
static int rt6_add_nexthop(struct sk_buff *skb, struct fib6_info *rt)
static int rt6_add_nexthop(struct sk_buff *skb, const struct fib6_nh *fib6_nh)
{
const struct net_device *dev = rt->fib6_nh.nh_dev;
const struct net_device *dev = fib6_nh->nh_dev;
struct rtnexthop *rtnh;
unsigned int flags = 0;
@ -4633,10 +4633,10 @@ static int rt6_add_nexthop(struct sk_buff *skb, struct fib6_info *rt)
if (!rtnh)
goto nla_put_failure;
rtnh->rtnh_hops = rt->fib6_nh.nh_weight - 1;
rtnh->rtnh_hops = fib6_nh->nh_weight - 1;
rtnh->rtnh_ifindex = dev ? dev->ifindex : 0;
if (rt6_nexthop_info(skb, rt, &flags, true) < 0)
if (rt6_nexthop_info(skb, fib6_nh, &flags, true) < 0)
goto nla_put_failure;
rtnh->rtnh_flags = flags;
@ -4766,18 +4766,19 @@ static int rt6_fill_node(struct net *net, struct sk_buff *skb,
if (!mp)
goto nla_put_failure;
if (rt6_add_nexthop(skb, rt) < 0)
if (rt6_add_nexthop(skb, &rt->fib6_nh) < 0)
goto nla_put_failure;
list_for_each_entry_safe(sibling, next_sibling,
&rt->fib6_siblings, fib6_siblings) {
if (rt6_add_nexthop(skb, sibling) < 0)
if (rt6_add_nexthop(skb, &sibling->fib6_nh) < 0)
goto nla_put_failure;
}
nla_nest_end(skb, mp);
} else {
if (rt6_nexthop_info(skb, rt, &rtm->rtm_flags, false) < 0)
if (rt6_nexthop_info(skb, &rt->fib6_nh, &rtm->rtm_flags,
false) < 0)
goto nla_put_failure;
}