From 502a9b9302340b022a480c22dc8ca9cc308bd772 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Fri, 22 Jul 2005 12:49:30 -0700
Subject: [PATCH] --- yaml --- r: 4931 b: refs/heads/master c:
 4c1217deeb148ff8ab838ba4f1875d0f52dea343 h: refs/heads/master i:   4929:
 a5e5d10c35b9e64d46b5cc26822279f63273530e   4927:
 acc10e9cd2d21ddcd5ec3f09354eb094d34dc7e5 v: v3

---
 [refs]                               | 2 +-
 trunk/net/ipv6/netfilter/ip6_queue.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 35c6083202f8..3f8e38e0e910 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28e212fb360ce2568edd60b93d60683d5ad24146
+refs/heads/master: 4c1217deeb148ff8ab838ba4f1875d0f52dea343
diff --git a/trunk/net/ipv6/netfilter/ip6_queue.c b/trunk/net/ipv6/netfilter/ip6_queue.c
index 750943e2d34e..5493180f0d44 100644
--- a/trunk/net/ipv6/netfilter/ip6_queue.c
+++ b/trunk/net/ipv6/netfilter/ip6_queue.c
@@ -76,7 +76,9 @@ static DECLARE_MUTEX(ipqnl_sem);
 static void
 ipq_issue_verdict(struct ipq_queue_entry *entry, int verdict)
 {
+	local_bh_disable();
 	nf_reinject(entry->skb, entry->info, verdict);
+	local_bh_enable();
 	kfree(entry);
 }