Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket2.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket2.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.109 retrieving revision 1.109.6.1 diff -u -p -r1.109 -r1.109.6.1 --- src/sys/kern/uipc_socket2.c 2011/08/31 18:31:03 1.109 +++ src/sys/kern/uipc_socket2.c 2012/02/18 07:35:34 1.109.6.1 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket2.c,v 1.109 2011/08/31 18:31:03 plunky Exp $ */ +/* $NetBSD: uipc_socket2.c,v 1.109.6.1 2012/02/18 07:35:34 mrg Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.109 2011/08/31 18:31:03 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.109.6.1 2012/02/18 07:35:34 mrg Exp $"); #include "opt_mbuftrace.h" #include "opt_sb_max.h" @@ -265,7 +265,6 @@ sonewconn(struct socket *head, int conns so->so_options = head->so_options &~ SO_ACCEPTCONN; so->so_linger = head->so_linger; so->so_state = head->so_state | SS_NOFDREF; - so->so_nbio = head->so_nbio; so->so_proto = head->so_proto; so->so_timeo = head->so_timeo; so->so_pgid = head->so_pgid;