diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:48:21 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:48:21 +0000 |
| commit | a7ce7d5e94c98ef5b867f61b2ebecd563f4b6ec9 (patch) | |
| tree | f3dc5381e660de7685258f75d16c381c4c47694a /net/ipv4 | |
| parent | 57445428488a2862840c4d7c96d7746c11031aaf (diff) | |
Merge with Linux 2.4.0-test6-pre7.
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/netfilter/ip_queue.c | 6 |
1 files changed, 4 insertions, 2 deletions
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) { |