]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
[PATCH] drop comment change from NetROM-deadlock-fix.patch
authorchrisw@osdl.org <chrisw@osdl.org>
Fri, 11 Mar 2005 23:38:58 +0000 (15:38 -0800)
committerGreg KH <gregkh@suse.de>
Thu, 12 May 2005 05:10:07 +0000 (22:10 -0700)
2.6.11.4/NetROM-deadlock-fix.patch

index afe48ddd904f491a0d65ed79219daf8884027433..35cfffa6a006eea22d046133926668b6144cbdbe 100644 (file)
@@ -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
-