r2639 - trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches

[Sven Luther]

Author: luther
Date: 2005-03-08 07:58:39 +0100 (Tue, 08 Mar 2005)
New Revision: 2639

Removed:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-net-8139too-locking.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO
Log:
Dropped drivers-net-8139too-locking as hch got a different fix in 2.6.11.


Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO	2005-03-08 06:44:53 UTC (rev 2638)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO	2005-03-08 06:58:39 UTC (rev 2639)
@@ -4,7 +4,6 @@
 # + x86-i486_emu.dpatch				# OK, needs rediff
 
 # + modular-ide.dpatch 				# FAILED
-# + drivers-net-8139too-locking.dpatch		# FAILED
 # + remove-references-to-removed-drivers.dpatch	# FAILED
 # + drm-locking-fixes.dpatch			# FAILED
 # + ia64-generic-no-smp.dpatch			# FAILED

Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-net-8139too-locking.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-net-8139too-locking.dpatch	2005-03-08 06:44:53 UTC (rev 2638)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-net-8139too-locking.dpatch	2005-03-08 06:58:39 UTC (rev 2639)
@@ -1,78 +0,0 @@
-#! /bin/sh -e 
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: fix deadlock on shutdown in drivers/net/8139too.c
-## DP: Patch author: Herbert Xu
-## DP: Upstream status: discussed with viro and jgarzik, probably wants an
-## DP: Upstream status: interruptible rtnl_lock variant
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
---- kernel-source-2.6.6/drivers/net/8139too.c	2004-05-10 19:47:54.000000000 +1000
-+++ kernel-source-2.6.6-1/drivers/net/8139too.c	2004-05-10 22:21:32.000000000 +1000
-@@ -112,6 +112,7 @@
- #include <linux/crc32.h>
- #include <linux/suspend.h>
- #include <asm/io.h>
-+#include <asm/semaphore.h>
- #include <asm/uaccess.h>
- #include <asm/irq.h>
- 
-@@ -590,6 +591,7 @@
- 	struct rtl_extra_stats xstats;
- 	int time_to_die;
- 	struct mii_if_info mii;
-+	struct semaphore mdio_sem;
- 	unsigned int regs_len;
- };
- 
-@@ -1025,6 +1027,7 @@
- 	tp->mii.mdio_write = mdio_write;
- 	tp->mii.phy_id_mask = 0x3f;
- 	tp->mii.reg_num_mask = 0x1f;
-+	init_MUTEX (&tp->mdio_sem);
- 
- 	/* dev is fully set up and ready to use now */
- 	DPRINTK("about to register device named %s (%p)...\n", dev->name, dev);
-@@ -1633,9 +1636,10 @@
- 		if (tp->time_to_die)
- 			break;
- 
--		rtnl_lock ();
-+		if (down_interruptible (&tp->mdio_sem))
-+			break;
- 		rtl8139_thread_iter (dev, tp, tp->mmio_addr);
--		rtnl_unlock ();
-+		up (&tp->mdio_sem);
- 	}
- 
- 	complete_and_exit (&tp->thr_exited, 0);
-@@ -2221,9 +2225,9 @@
- 		ret = kill_proc (tp->thr_pid, SIGTERM, 1);
- 		if (ret) {
- 			printk (KERN_ERR "%s: unable to signal thread\n", dev->name);
--			return ret;
-+		} else {
-+			wait_for_completion (&tp->thr_exited);
- 		}
--		wait_for_completion (&tp->thr_exited);
- 	}
- 	
- 	if (netif_msg_ifdown(tp))
-@@ -2464,10 +2468,14 @@
- 	if (!netif_running(dev))
- 		return -EINVAL;
- 
-+	if (down_interruptible (&np->mdio_sem))
-+		return -ERESTARTSYS;
-+
- 	spin_lock_irq(&np->lock);
- 	rc = generic_mii_ioctl(&np->mii, if_mii(rq), cmd, NULL);
- 	spin_unlock_irq(&np->lock);
- 
-+	up (&np->mdio_sem);
- 	return rc;
- }
-