CVS commit: src/sys

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Mon Feb 13 04:05:58 UTC 2017

Modified Files:
        src/sys/netinet: in_pcb.c
        src/sys/netinet6: in6_pcb.c

Log Message:
Replace splnet with splsoftnet


To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/sys/netinet/in_pcb.c
cvs rdiff -u -r1.156 -r1.157 src/sys/netinet6/in6_pcb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/netinet/in_pcb.c
diff -u src/sys/netinet/in_pcb.c:1.174 src/sys/netinet/in_pcb.c:1.175
--- src/sys/netinet/in_pcb.c:1.174	Mon Jan 23 09:14:24 2017
+++ src/sys/netinet/in_pcb.c	Mon Feb 13 04:05:58 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: in_pcb.c,v 1.174 2017/01/23 09:14:24 ozaki-r Exp $	*/
+/*	$NetBSD: in_pcb.c,v 1.175 2017/02/13 04:05:58 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,7 +93,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.174 2017/01/23 09:14:24 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.175 2017/02/13 04:05:58 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -212,7 +212,7 @@ in_pcballoc(struct socket *so, void *v)
 	}
 #endif
 	so->so_pcb = inp;
-	s = splnet();
+	s = splsoftnet();
 	TAILQ_INSERT_HEAD(&table->inpt_queue, &inp->inp_head, inph_queue);
 	LIST_INSERT_HEAD(INPCBHASH_PORT(table, inp->inp_lport), &inp->inp_head,
 	    inph_lhash);
@@ -621,7 +621,7 @@ in_pcbdetach(void *v)
 #endif
 	so->so_pcb = NULL;
 
-	s = splnet();
+	s = splsoftnet();
 	in_pcbstate(inp, INP_ATTACHED);
 	LIST_REMOVE(&inp->inp_head, inph_lhash);
 	TAILQ_REMOVE(&inp->inp_table->inpt_queue, &inp->inp_head, inph_queue);

Index: src/sys/netinet6/in6_pcb.c
diff -u src/sys/netinet6/in6_pcb.c:1.156 src/sys/netinet6/in6_pcb.c:1.157
--- src/sys/netinet6/in6_pcb.c:1.156	Mon Jan 23 09:14:24 2017
+++ src/sys/netinet6/in6_pcb.c	Mon Feb 13 04:05:58 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_pcb.c,v 1.156 2017/01/23 09:14:24 ozaki-r Exp $	*/
+/*	$NetBSD: in6_pcb.c,v 1.157 2017/02/13 04:05:58 ozaki-r Exp $	*/
 /*	$KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.156 2017/01/23 09:14:24 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.157 2017/02/13 04:05:58 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -178,7 +178,7 @@ in6_pcballoc(struct socket *so, void *v)
 		}
 	}
 #endif /* IPSEC */
-	s = splnet();
+	s = splsoftnet();
 	TAILQ_INSERT_HEAD(&table->inpt_queue, (struct inpcb_hdr*)in6p,
 	    inph_queue);
 	LIST_INSERT_HEAD(IN6PCBHASH_PORT(table, in6p->in6p_lport),
@@ -627,7 +627,7 @@ in6_pcbdetach(struct in6pcb *in6p)
 #endif
 	so->so_pcb = NULL;
 
-	s = splnet();
+	s = splsoftnet();
 	in6_pcbstate(in6p, IN6P_ATTACHED);
 	LIST_REMOVE(&in6p->in6p_head, inph_lhash);
 	TAILQ_REMOVE(&in6p->in6p_table->inpt_queue, &in6p->in6p_head,