Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 13 Jun 2018 23:19:54 +0000 (UTC)
From:      Matt Macy <mmacy@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r335093 - in head/sys: netinet netinet6
Message-ID:  <201806132319.w5DNJsrg038084@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mmacy
Date: Wed Jun 13 23:19:54 2018
New Revision: 335093
URL: https://svnweb.freebsd.org/changeset/base/335093

Log:
  Fix PCBGROUPS build post CK conversion of pcbinfo

Modified:
  head/sys/netinet/in_pcb.c
  head/sys/netinet/in_pcb.h
  head/sys/netinet/in_pcbgroup.c
  head/sys/netinet6/in6_pcb.c

Modified: head/sys/netinet/in_pcb.c
==============================================================================
--- head/sys/netinet/in_pcb.c	Wed Jun 13 22:00:08 2018	(r335092)
+++ head/sys/netinet/in_pcb.c	Wed Jun 13 23:19:54 2018	(r335093)
@@ -2025,7 +2025,7 @@ in_pcblookup_group(struct inpcbinfo *pcbinfo, struct i
 	INP_GROUP_LOCK(pcbgroup);
 	head = &pcbgroup->ipg_hashbase[INP_PCBHASH(faddr.s_addr, lport, fport,
 	    pcbgroup->ipg_hashmask)];
-	LIST_FOREACH(inp, head, inp_pcbgrouphash) {
+	CK_LIST_FOREACH(inp, head, inp_pcbgrouphash) {
 #ifdef INET6
 		/* XXX inp locking */
 		if ((inp->inp_vflag & INP_IPV4) == 0)
@@ -2075,7 +2075,7 @@ in_pcblookup_group(struct inpcbinfo *pcbinfo, struct i
 
 		head = &pcbgroup->ipg_hashbase[INP_PCBHASH(INADDR_ANY,
 		    lport, 0, pcbgroup->ipg_hashmask)];
-		LIST_FOREACH(inp, head, inp_pcbgrouphash) {
+		CK_LIST_FOREACH(inp, head, inp_pcbgrouphash) {
 #ifdef INET6
 			/* XXX inp locking */
 			if ((inp->inp_vflag & INP_IPV4) == 0)
@@ -2149,7 +2149,7 @@ in_pcblookup_group(struct inpcbinfo *pcbinfo, struct i
 		 */
 		head = &pcbinfo->ipi_wildbase[INP_PCBHASH(INADDR_ANY, lport,
 		    0, pcbinfo->ipi_wildmask)];
-		LIST_FOREACH(inp, head, inp_pcbgroup_wild) {
+		CK_LIST_FOREACH(inp, head, inp_pcbgroup_wild) {
 #ifdef INET6
 			/* XXX inp locking */
 			if ((inp->inp_vflag & INP_IPV4) == 0)

Modified: head/sys/netinet/in_pcb.h
==============================================================================
--- head/sys/netinet/in_pcb.h	Wed Jun 13 22:00:08 2018	(r335092)
+++ head/sys/netinet/in_pcb.h	Wed Jun 13 23:19:54 2018	(r335093)
@@ -276,7 +276,7 @@ struct inpcb {
 	TAILQ_ENTRY(inpcb) inp_input;	/* pacing in  queue next lock(b) */
 	struct	inpcbinfo *inp_pcbinfo;	/* (c) PCB list info */
 	struct	inpcbgroup *inp_pcbgroup; /* (g/i) PCB group list */
-	LIST_ENTRY(inpcb) inp_pcbgroup_wild; /* (g/i/h) group wildcard entry */
+	CK_LIST_ENTRY(inpcb) inp_pcbgroup_wild; /* (g/i/h) group wildcard entry */
 	struct	ucred	*inp_cred;	/* (c) cache of socket cred */
 	u_int32_t inp_flow;		/* (i) IPv6 flow information */
 	u_char	inp_vflag;		/* (i) IP version flag (v4/v6) */

Modified: head/sys/netinet/in_pcbgroup.c
==============================================================================
--- head/sys/netinet/in_pcbgroup.c	Wed Jun 13 22:00:08 2018	(r335092)
+++ head/sys/netinet/in_pcbgroup.c	Wed Jun 13 23:19:54 2018	(r335093)
@@ -207,7 +207,7 @@ in_pcbgroup_destroy(struct inpcbinfo *pcbinfo)
 
 	for (pgn = 0; pgn < pcbinfo->ipi_npcbgroups; pgn++) {
 		pcbgroup = &pcbinfo->ipi_pcbgroups[pgn];
-		KASSERT(LIST_EMPTY(pcbinfo->ipi_listhead),
+		KASSERT(CK_LIST_EMPTY(pcbinfo->ipi_listhead),
 		    ("in_pcbinfo_destroy: listhead not empty"));
 		INP_GROUP_LOCK_DESTROY(pcbgroup);
 		hashdestroy(pcbgroup->ipg_hashbase, M_PCB,
@@ -338,7 +338,7 @@ in_pcbwild_add(struct inpcb *inp)
 		INP_GROUP_LOCK(&pcbinfo->ipi_pcbgroups[pgn]);
 	head = &pcbinfo->ipi_wildbase[INP_PCBHASH(INADDR_ANY, inp->inp_lport,
 	    0, pcbinfo->ipi_wildmask)];
-	LIST_INSERT_HEAD(head, inp, inp_pcbgroup_wild);
+	CK_LIST_INSERT_HEAD(head, inp, inp_pcbgroup_wild);
 	inp->inp_flags2 |= INP_PCBGROUPWILD;
 	for (pgn = 0; pgn < pcbinfo->ipi_npcbgroups; pgn++)
 		INP_GROUP_UNLOCK(&pcbinfo->ipi_pcbgroups[pgn]);
@@ -357,7 +357,7 @@ in_pcbwild_remove(struct inpcb *inp)
 	pcbinfo = inp->inp_pcbinfo;
 	for (pgn = 0; pgn < pcbinfo->ipi_npcbgroups; pgn++)
 		INP_GROUP_LOCK(&pcbinfo->ipi_pcbgroups[pgn]);
-	LIST_REMOVE(inp, inp_pcbgroup_wild);
+	CK_LIST_REMOVE(inp, inp_pcbgroup_wild);
 	for (pgn = 0; pgn < pcbinfo->ipi_npcbgroups; pgn++)
 		INP_GROUP_UNLOCK(&pcbinfo->ipi_pcbgroups[pgn]);
 	inp->inp_flags2 &= ~INP_PCBGROUPWILD;
@@ -415,7 +415,7 @@ in_pcbgroup_update_internal(struct inpcbinfo *pcbinfo,
 	oldpcbgroup = inp->inp_pcbgroup;
 	if (oldpcbgroup != NULL && oldpcbgroup != newpcbgroup) {
 		INP_GROUP_LOCK(oldpcbgroup);
-		LIST_REMOVE(inp, inp_pcbgrouphash);
+		CK_LIST_REMOVE(inp, inp_pcbgrouphash);
 		inp->inp_pcbgroup = NULL;
 		INP_GROUP_UNLOCK(oldpcbgroup);
 	}
@@ -445,7 +445,7 @@ in_pcbgroup_update_internal(struct inpcbinfo *pcbinfo,
 			    inp->inp_fport,
 			    newpcbgroup->ipg_hashmask)];
 		}
-		LIST_INSERT_HEAD(pcbhash, inp, inp_pcbgrouphash);
+		CK_LIST_INSERT_HEAD(pcbhash, inp, inp_pcbgrouphash);
 		inp->inp_pcbgroup = newpcbgroup;
 		INP_GROUP_UNLOCK(newpcbgroup);
 	}
@@ -548,7 +548,7 @@ in_pcbgroup_remove(struct inpcb *inp)
 	pcbgroup = inp->inp_pcbgroup;
 	if (pcbgroup != NULL) {
 		INP_GROUP_LOCK(pcbgroup);
-		LIST_REMOVE(inp, inp_pcbgrouphash);
+		CK_LIST_REMOVE(inp, inp_pcbgrouphash);
 		inp->inp_pcbgroup = NULL;
 		INP_GROUP_UNLOCK(pcbgroup);
 	}

Modified: head/sys/netinet6/in6_pcb.c
==============================================================================
--- head/sys/netinet6/in6_pcb.c	Wed Jun 13 22:00:08 2018	(r335092)
+++ head/sys/netinet6/in6_pcb.c	Wed Jun 13 23:19:54 2018	(r335093)
@@ -946,7 +946,7 @@ in6_pcblookup_group(struct inpcbinfo *pcbinfo, struct 
 	INP_GROUP_LOCK(pcbgroup);
 	head = &pcbgroup->ipg_hashbase[INP_PCBHASH(
 	    INP6_PCBHASHKEY(faddr), lport, fport, pcbgroup->ipg_hashmask)];
-	LIST_FOREACH(inp, head, inp_pcbgrouphash) {
+	CK_LIST_FOREACH(inp, head, inp_pcbgrouphash) {
 		/* XXX inp locking */
 		if ((inp->inp_vflag & INP_IPV6) == 0)
 			continue;
@@ -987,7 +987,7 @@ in6_pcblookup_group(struct inpcbinfo *pcbinfo, struct 
 		 */
 		head = &pcbgroup->ipg_hashbase[
 		    INP_PCBHASH(INADDR_ANY, lport, 0, pcbgroup->ipg_hashmask)];
-		LIST_FOREACH(inp, head, inp_pcbgrouphash) {
+		CK_LIST_FOREACH(inp, head, inp_pcbgrouphash) {
 			/* XXX inp locking */
 			if ((inp->inp_vflag & INP_IPV6) == 0)
 				continue;
@@ -1049,7 +1049,7 @@ in6_pcblookup_group(struct inpcbinfo *pcbinfo, struct 
 		head = &pcbinfo->ipi_wildbase[INP_PCBHASH(
 		    INP6_PCBHASHKEY(&in6addr_any), lport, 0,
 		    pcbinfo->ipi_wildmask)];
-		LIST_FOREACH(inp, head, inp_pcbgroup_wild) {
+		CK_LIST_FOREACH(inp, head, inp_pcbgroup_wild) {
 			/* XXX inp locking */
 			if ((inp->inp_vflag & INP_IPV6) == 0)
 				continue;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806132319.w5DNJsrg038084>