diff options
| author | Stefano Brivio <sbrivio@redhat.com> | 2019-06-21 17:45:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-24 10:18:49 -0700 |
| commit | ef11209d421976fe0990b43dbf91e2d6918813d0 (patch) | |
| tree | f57f204271aba6188fed7642f962f4236ca156f8 /net/ipv6 | |
| parent | ee28906fd7a1437ca77a60a99b6b9c6d676220f8 (diff) | |
| download | linux-ef11209d421976fe0990b43dbf91e2d6918813d0.tar.bz2 | |
Revert "net/ipv6: Bail early if user only wants cloned entries"
This reverts commit 08e814c9e8eb5a982cbd1e8f6bd255d97c51026f: as we
are preparing to fix listing and dumping of IPv6 cached routes, we
need to allow RTM_F_CLONED as a flag to match routes against while
dumping them.
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6_fib.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 083e175e11ef..8a7506b3451b 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -573,13 +573,10 @@ static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) } else if (nlmsg_len(nlh) >= sizeof(struct rtmsg)) { struct rtmsg *rtm = nlmsg_data(nlh); - arg.filter.flags = rtm->rtm_flags & (RTM_F_PREFIX|RTM_F_CLONED); + if (rtm->rtm_flags & RTM_F_PREFIX) + arg.filter.flags = RTM_F_PREFIX; } - /* fib entries are never clones */ - if (arg.filter.flags & RTM_F_CLONED) - goto out; - w = (void *)cb->args[2]; if (!w) { /* New dump: |