From: chrisw@osdl.org <chrisw@osdl.org>
Date: Fri, 11 Mar 2005 23:38:58 +0000 (-0800)
Subject: [PATCH] drop comment change from NetROM-deadlock-fix.patch
X-Git-Tag: v2.6.11.9~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10a59b80e7ccc5298101084a7b0de5eac9cc91d7;p=thirdparty%2Fkernel%2Fstable-queue.git

[PATCH] drop comment change from NetROM-deadlock-fix.patch
---

diff --git a/2.6.11.4/NetROM-deadlock-fix.patch b/2.6.11.4/NetROM-deadlock-fix.patch
index afe48ddd904..35cfffa6a00 100644
--- a/2.6.11.4/NetROM-deadlock-fix.patch
+++ b/2.6.11.4/NetROM-deadlock-fix.patch
@@ -56,7 +56,7 @@ Index: bk-afu/net/netrom/nr_in.c
  	switch (frametype) {
  	case NR_CONNREQ:
  		nr_write_internal(sk, NR_CONNACK);
-@@ -265,12 +258,10 @@
+@@ -265,8 +258,6 @@
  	default:
  		break;
  	}
@@ -65,14 +65,3 @@ Index: bk-afu/net/netrom/nr_in.c
  	return queued;
  }
  
--/* Higher level upcall for a LAPB frame */
-+/* Higher level upcall for a LAPB frame - called with sk locked */
- int nr_process_rx_frame(struct sock *sk, struct sk_buff *skb)
- {
- 	nr_cb *nr = nr_sk(sk);
-
-_______________________________________________
-stable mailing list
-stable@linux.kernel.org
-http://linux.kernel.org/mailman/listinfo/stable
-