Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[deliverable/linux.git] / net / netfilter / nf_conntrack_core.c

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index f60b4fdeeb8cc4fc600506ecc58e2bdc4cad1654..afde5f5e728a320773be246ecbcfcca7f5a16617 100644 (file)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -74,8 +74,7 @@ void nf_conntrack_lock(spinlock_t *lock) __acquires(lock)
        spin_lock(lock);
        while (unlikely(nf_conntrack_locks_all)) {
                spin_unlock(lock);
-               spin_lock(&nf_conntrack_locks_all_lock);
-               spin_unlock(&nf_conntrack_locks_all_lock);
+               spin_unlock_wait(&nf_conntrack_locks_all_lock);
                spin_lock(lock);
        }
 }
@@ -121,8 +120,7 @@ static void nf_conntrack_all_lock(void)
        nf_conntrack_locks_all = true;
 
        for (i = 0; i < CONNTRACK_LOCKS; i++) {
-               spin_lock(&nf_conntrack_locks[i]);
-               spin_unlock(&nf_conntrack_locks[i]);
+               spin_unlock_wait(&nf_conntrack_locks[i]);
        }
 }