[src/trunk]: src/sys/netinet Oops. Fix LOCKDEBUG panic -- and spurious calls...

[tls <tls%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/09fe3ff3090c
branches:  trunk
changeset: 753556:09fe3ff3090c
user:      tls <tls%NetBSD.org@localhost>
date:      Thu Apr 01 14:31:51 2010 +0000

description:
Oops.  Fix LOCKDEBUG panic -- and spurious calls to tcp_output()! -- in
previous.  Be careful with that {}, Eugene.

diffstat:

 sys/netinet/tcp_input.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r 82739c28f34c -r 09fe3ff3090c sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c   Thu Apr 01 14:13:25 2010 +0000
+++ b/sys/netinet/tcp_input.c   Thu Apr 01 14:31:51 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_input.c,v 1.301 2010/04/01 00:24:41 tls Exp $      */
+/*     $NetBSD: tcp_input.c,v 1.302 2010/04/01 14:31:51 tls Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -145,7 +145,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.301 2010/04/01 00:24:41 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.302 2010/04/01 14:31:51 tls Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -1786,10 +1786,11 @@
                                            tp->t_rxtcur);
 
                                sowwakeup(so);
-                               if (so->so_snd.sb_cc)
+                               if (so->so_snd.sb_cc) {
                                        KERNEL_LOCK(1, NULL);
                                        (void) tcp_output(tp);
                                        KERNEL_UNLOCK_ONE(NULL);
+                               }
                                if (tcp_saveti)
                                        m_freem(tcp_saveti);
                                return;
@@ -1884,10 +1885,11 @@
                        }
                        sorwakeup(so);
                        tcp_setup_ack(tp, th);
-                       if (tp->t_flags & TF_ACKNOW)
+                       if (tp->t_flags & TF_ACKNOW) {
                                KERNEL_LOCK(1, NULL);
                                (void) tcp_output(tp);
                                KERNEL_UNLOCK_ONE(NULL);
+                       }
                        if (tcp_saveti)
                                m_freem(tcp_saveti);
                        return;