Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-2]: src/sys/kern Back out ticket #5598, it causes netboot problem...



details:   https://anonhg.NetBSD.org/src/rev/845678a89e6e
branches:  netbsd-2
changeset: 564066:845678a89e6e
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Sep 13 23:23:56 2005 +0000

description:
Back out ticket #5598, it causes netboot problems for (at least) sparc.

diffstat:

 sys/kern/uipc_socket.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 574f91dc20cb -r 845678a89e6e sys/kern/uipc_socket.c
--- a/sys/kern/uipc_socket.c    Tue Sep 13 23:09:45 2005 +0000
+++ b/sys/kern/uipc_socket.c    Tue Sep 13 23:23:56 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_socket.c,v 1.97.2.1.2.1 2005/08/22 21:42:19 riz Exp $     */
+/*     $NetBSD: uipc_socket.c,v 1.97.2.1.2.2 2005/09/13 23:23:56 riz Exp $     */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.97.2.1.2.1 2005/08/22 21:42:19 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.97.2.1.2.2 2005/09/13 23:23:56 riz Exp $");
 
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
@@ -1040,8 +1040,10 @@
         * While we process the initial mbufs containing address and control
         * info, we save a copy of m->m_nextpkt into nextrecord.
         */
+#ifdef notyet /* XXXX */
        if (uio->uio_procp)
                uio->uio_procp->p_stats->p_ru.ru_msgrcv++;
+#endif
        KASSERT(m == so->so_rcv.sb_mb);
        SBLASTRECORDCHK(&so->so_rcv, "soreceive 1");
        SBLASTMBUFCHK(&so->so_rcv, "soreceive 1");



Home | Main Index | Thread Index | Old Index