summaryrefslogtreecommitdiffstats
path: root/net/core/dst.c
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2016-02-02 13:23:36 +1100
committerJoel Stanley <joel@jms.id.au>2016-02-02 13:23:42 +1100
commitf3f4aeb9ea8954c0da3cf0d12693f9a57f1f4ac7 (patch)
tree3663ab29736373c565d88e941162d37311cc3c75 /net/core/dst.c
parent2a3f5f14fdf2e8fb680af168fa642ef8a9218ffb (diff)
parent849a2d3d9be31368559e6852cf64d749e6903818 (diff)
downloadtalos-obmc-linux-openbmc-20160202-1.tar.gz
talos-obmc-linux-openbmc-20160202-1.zip
Merge tag 'v4.3.5' into dev-4.3openbmc-20160202-1
This is the 4.3.5 stable release Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'net/core/dst.c')
-rw-r--r--net/core/dst.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dst.c b/net/core/dst.c
index d6a5a0bc7df5..8852021a7093 100644
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -301,12 +301,13 @@ void dst_release(struct dst_entry *dst)
{
if (dst) {
int newrefcnt;
+ unsigned short nocache = dst->flags & DST_NOCACHE;
newrefcnt = atomic_dec_return(&dst->__refcnt);
if (unlikely(newrefcnt < 0))
net_warn_ratelimited("%s: dst:%p refcnt:%d\n",
__func__, dst, newrefcnt);
- if (!newrefcnt && unlikely(dst->flags & DST_NOCACHE))
+ if (!newrefcnt && unlikely(nocache))
call_rcu(&dst->rcu_head, dst_destroy_rcu);
}
}
OpenPOWER on IntegriCloud