r3672 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches

[Simon Horman]

Author: horms
Date: 2005-08-02 06:24:49 +0000 (Tue, 02 Aug 2005)
New Revision: 3672

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/175-net-ipv6-netfilter-deadlock.diff
Removed:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/175-net-ipv6-netfilter-deadlock.diff
Log:
Fix deadlock in ip6_queue

Deleted: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/175-net-ipv6-netfilter-deadlock.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/175-net-ipv6-netfilter-deadlock.diff	2005-08-02 06:24:38 UTC (rev 3671)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/175-net-ipv6-netfilter-deadlock.diff	2005-08-02 06:24:49 UTC (rev 3672)
@@ -1,33 +0,0 @@
-From stable-bounces at linux.kernel.org  Fri Jul 22 00:35:49 2005
-Date: Fri, 22 Jul 2005 09:35:34 +0200
-From: Patrick McHardy <kaber at trash.net>
-To: "David S. Miller" <davem at davemloft.net>
-Cc: Netfilter Development Mailinglist <netfilter-devel at lists.netfilter.org>,
-        stable at kernel.org
-Subject: [PATCH] [NETFILTER]: Fix deadlock in ip6_queue
-
-[NETFILTER]: Fix deadlock in ip6_queue
-
-Already fixed in ip_queue, ip6_queue was missed.
-
-Signed-off-by: Patrick McHardy <kaber at trash.net>
-Signed-off-by: Chris Wright <chrisw at osdl.org>
----
-
- net/ipv6/netfilter/ip6_queue.c |    2 ++
- 1 files changed, 2 insertions(+)
-
-Index: linux-2.6.12.y/net/ipv6/netfilter/ip6_queue.c
-===================================================================
---- linux-2.6.12.y.orig/net/ipv6/netfilter/ip6_queue.c
-+++ linux-2.6.12.y/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);
- }
- 

Copied: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/175-net-ipv6-netfilter-deadlock.diff (from rev 3671, trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/175-net-ipv6-netfilter-deadlock.diff)