diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-06-21 17:35:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-21 17:35:22 -0400 |
| commit | 3d09198243b89457649241fb63f809a96a22a8ce (patch) | |
| tree | f8f62d4a0b47ebc44682363a8d23b8963e1ca3e9 /net/ipv6/ip6_fib.c | |
| parent | Merge branch 'qed-File-split-and-rename-towards-iWARP-support' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-3d09198243b89457649241fb63f809a96a22a8ce.tar.xz linux-dev-3d09198243b89457649241fb63f809a96a22a8ce.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two entries being added at the same time to the IFLA
policy table, whilst parallel bug fixes to decnet
routing dst handling overlapping with the dst gc removal
in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_fib.c')
| -rw-r--r-- | net/ipv6/ip6_fib.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 4f3e4657f2d6..5477ba729c36 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -286,8 +286,7 @@ struct dst_entry *fib6_rule_lookup(struct net *net, struct flowi6 *fl6, struct rt6_info *rt; rt = lookup(net, net->ipv6.fib6_main_tbl, fl6, flags); - if (rt->rt6i_flags & RTF_REJECT && - rt->dst.error == -EAGAIN) { + if (rt->dst.error == -EAGAIN) { ip6_rt_put(rt); rt = net->ipv6.ip6_null_entry; dst_hold(&rt->dst); |