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

[Simon Horman]

Author: horms
Date: 2005-08-02 09:19:31 +0000 (Tue, 02 Aug 2005)
New Revision: 3675

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/177_rocket_c-fix-ldisc-ref-count.diff
Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-11
Log:
Fix ldisc ref count handling in rocketport driver

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2005-08-02 07:45:25 UTC (rev 3674)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2005-08-02 09:19:31 UTC (rev 3675)
@@ -46,9 +46,14 @@
 
   * 176_net-ipv4-netfilter-untracked-refcount.diff
     Wait until all references to ip_conntrack_untracked are dropped on unload
+    (Simon Horman)
 
- -- Simon Horman <horms at debian.org>  Tue,  2 Aug 2005 16:38:56 +0900
+  * 177_rocket_c-fix-ldisc-ref-count.diff
+    Fix ldisc ref count handling in rocketport driver
+    (Simon Horman)
 
+ -- Simon Horman <horms at debian.org>  Tue,  2 Aug 2005 19:45:34 +0900
+
 kernel-source-2.4.27 (2.4.27-10) unstable; urgency=low
 
   * 155_net-bluetooth-signdness-fix.diff:

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/177_rocket_c-fix-ldisc-ref-count.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/177_rocket_c-fix-ldisc-ref-count.diff	2005-08-02 07:45:25 UTC (rev 3674)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/177_rocket_c-fix-ldisc-ref-count.diff	2005-08-02 09:19:31 UTC (rev 3675)
@@ -0,0 +1,42 @@
+From stable-bounces at linux.kernel.org  Thu Jul 14 16:54:10 2005
+To: stable at kernel.org
+From: akpm at osdl.org
+Date: Thu, 14 Jul 2005 16:46:26 -0700
+Cc: akpm at osdl.org, mostrows at watson.ibm.com
+Subject: [patch] rocket.c: Fix ldisc ref count handling
+
+From: Michal Ostrowski <mostrows at watson.ibm.com>
+
+If bailing out because there is nothing to receive in rp_do_receive(),
+tty_ldisc_deref is not called.  Failure to do so increases the ref count=20
+and causes release_dev() to hang since it can't get the ref count to 0.
+
+Signed-off-by: Michal Ostrowski <mostrows at watson.ibm.com>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+Signed-off-by: Chris Wright <chrisw at osdl.org>
+---
+
+ drivers/char/rocket.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletion(-)
+
+Rediffed for Debian's 2.4.27 Horms <horms at debian.org>
+
+--- a/drivers/char/rocket.c	2005-08-02 16:45:34.000000000 +0900
++++ b/drivers/char/rocket.c	2005-08-02 16:45:58.000000000 +0900
+@@ -257,7 +257,7 @@
+ 	printk("rp_do_receive(%d, %d)...", ToRecv, space);
+ #endif
+ 	if (ToRecv == 0 || (space <= 0))
+-		return;
++		goto done;
+ 	
+ 	/*
+ 	 * determine how many we can actually read in.  If we can't
+@@ -352,6 +352,7 @@
+ 		count += ToRecv;
+ 	}
+ 	ld->receive_buf(tty, tty->flip.char_buf, tty->flip.flag_buf, count);
++done:
+ 	tty_ldisc_deref(ld);
+ }
+ 

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-11
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-11	2005-08-02 07:45:25 UTC (rev 3674)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-11	2005-08-02 09:19:31 UTC (rev 3675)
@@ -9,3 +9,4 @@
 + 174_net-ipv4-netfilter-nat-mem.diff
 + 175-net-ipv6-netfilter-deadlock.diff
 + 176_net-ipv4-netfilter-untracked-refcount.diff
++ 177_rocket_c-fix-ldisc-ref-count.diff