diff options
| author |   David Ahern <dsahern@gmail.com> | 2019-03-27 20:53:47 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-03-29 10:48:03 -0700 |
| commit | 331c7a402358de6206232f6aab7aa48ec6c1088a (patch) | |
| tree | df3c9ac99ca90245fa32e9f5cd115f665eb2f117 /net/ipv4/fib_trie.c | |
| parent | ipv4: Define fib_get_nhs when CONFIG_IP_ROUTE_MULTIPATH is disabled (diff) | |
| download | linux-dev-331c7a402358de6206232f6aab7aa48ec6c1088a.tar.xz linux-dev-331c7a402358de6206232f6aab7aa48ec6c1088a.zip | |
ipv4: Move IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN to helper
in_dev lookup followed by IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN check
is called in several places, some with the rcu lock and others with the
rtnl held.
Move the check to a helper similar to what IPv6 has. Since the helper
can be invoked from either context use rcu_dereference_rtnl to
dereference ip_ptr.
Signed-off-by: David Ahern <dsahern@gmail.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_trie.c')
| -rw-r--r-- | net/ipv4/fib_trie.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 1704f432de1f..656d3d19f112 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -1471,12 +1471,10 @@ found: continue; for (nhsel = 0; nhsel < fi->fib_nhs; nhsel++) { const struct fib_nh *nh = &fi->fib_nh[nhsel]; - struct in_device *in_dev = __in_dev_get_rcu(nh->nh_dev); if (nh->nh_flags & RTNH_F_DEAD) continue; - if (in_dev && - IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN(in_dev) && + if (ip_ignore_linkdown(nh->nh_dev) && nh->nh_flags & RTNH_F_LINKDOWN && !(fib_flags & FIB_LOOKUP_IGNORE_LINKSTATE)) continue; |