From a7ce7d5e94c98ef5b867f61b2ebecd563f4b6ec9 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 8 Aug 2000 19:48:21 +0000
Subject: Merge with Linux 2.4.0-test6-pre7.

---
 net/ipv4/netfilter/ip_queue.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'net/ipv4')

diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
index 2ac8b22e2..4f8a8de07 100644
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@ -263,11 +263,13 @@ static int ipq_receive_peer(ipq_queue_t *q, ipq_peer_msg_t *m,
 {
 
 	int status = 0;
+	int busy;
 		
 	spin_lock_bh(&q->lock);
-	if (q->terminate || q->flushing)
-		return -EBUSY;
+	busy = (q->terminate || q->flushing);
 	spin_unlock_bh(&q->lock);
+	if (busy)
+		return -EBUSY;
 	if (len < sizeof(ipq_peer_msg_t))
 		return -EINVAL;
 	switch (type) {
-- 
cgit v1.2.3