diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-09-05 11:59:39 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-05 11:59:39 +0200 |
| commit | e9752c830a93d5ab5ed5f5ac184828449a8c52fd (patch) | |
| tree | 33bda1df3257186223142c1cf521fa3ab257e1e1 /net/ipv6/route.c | |
| parent | net: sock_map, fix missing ulp check in sock hash case (diff) | |
| parent | selftest: A few cleanups for fib_nexthops.sh (diff) | |
| download | linux-dev-e9752c830a93d5ab5ed5f5ac184828449a8c52fd.tar.xz linux-dev-e9752c830a93d5ab5ed5f5ac184828449a8c52fd.zip | |
Merge branch 'nexthops-Fix-multipath-notifications-for-IPv6-and-selftests'
David Ahern says:
====================
nexthops: Fix multipath notifications for IPv6 and selftests
A couple of bug fixes noticed while testing Donald's patch.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 2927e72e511a..977cfd09e2a3 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -5329,7 +5329,7 @@ static int rt6_fill_node_nexthop(struct sk_buff *skb, struct nexthop *nh, if (nexthop_is_multipath(nh)) { struct nlattr *mp; - mp = nla_nest_start(skb, RTA_MULTIPATH); + mp = nla_nest_start_noflag(skb, RTA_MULTIPATH); if (!mp) goto nla_put_failure; |