Merge tag 'v3.10.96' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / core / dst.c

diff --git a/net/core/dst.c b/net/core/dst.c
index 01f9980af86ec1634adfea3a524906f088034354..1bf6842b89b82f75d329679366baba8f173a6e9e 100644 (file)
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -280,10 +280,11 @@ void dst_release(struct dst_entry *dst)
 {
        if (dst) {
                int newrefcnt;
+               unsigned short nocache = dst->flags & DST_NOCACHE;
 
                newrefcnt = atomic_dec_return(&dst->__refcnt);
                WARN_ON(newrefcnt < 0);
-               if (!newrefcnt && unlikely(dst->flags & DST_NOCACHE))
+               if (!newrefcnt && unlikely(nocache))
                        call_rcu(&dst->rcu_head, dst_destroy_rcu);
        }
 }