Module Name: src
Committed By: ozaki-r
Date: Thu Mar 2 01:05:02 UTC 2017
Modified Files:
src/sys/netinet6: in6_pcb.c ip6_output.c
Log Message:
Use LIST_* macros
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.187 -r1.188 src/sys/netinet6/ip6_output.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/netinet6/in6_pcb.c
diff -u src/sys/netinet6/in6_pcb.c:1.157 src/sys/netinet6/in6_pcb.c:1.158
--- src/sys/netinet6/in6_pcb.c:1.157 Mon Feb 13 04:05:58 2017
+++ src/sys/netinet6/in6_pcb.c Thu Mar 2 01:05:02 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_pcb.c,v 1.157 2017/02/13 04:05:58 ozaki-r Exp $ */
+/* $NetBSD: in6_pcb.c,v 1.158 2017/03/02 01:05:02 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.157 2017/02/13 04:05:58 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.158 2017/03/02 01:05:02 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -862,9 +862,8 @@ in6_pcbpurgeif0(struct inpcbtable *table
* XXX controversial - is it really legal for kernel
* to force this?
*/
- for (imm = im6o->im6o_memberships.lh_first;
- imm != NULL; imm = nimm) {
- nimm = imm->i6mm_chain.le_next;
+ LIST_FOREACH_SAFE(imm, &im6o->im6o_memberships,
+ i6mm_chain, nimm) {
if (imm->i6mm_maddr->in6m_ifp == ifp) {
LIST_REMOVE(imm, i6mm_chain);
in6_leavegroup(imm);
Index: src/sys/netinet6/ip6_output.c
diff -u src/sys/netinet6/ip6_output.c:1.187 src/sys/netinet6/ip6_output.c:1.188
--- src/sys/netinet6/ip6_output.c:1.187 Wed Mar 1 08:54:12 2017
+++ src/sys/netinet6/ip6_output.c Thu Mar 2 01:05:02 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_output.c,v 1.187 2017/03/01 08:54:12 ozaki-r Exp $ */
+/* $NetBSD: ip6_output.c,v 1.188 2017/03/02 01:05:02 ozaki-r Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.187 2017/03/01 08:54:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.188 2017/03/02 01:05:02 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2574,12 +2574,12 @@ ip6_setmoptions(const struct sockopt *so
/*
* See if the membership already exists.
*/
- for (imm = im6o->im6o_memberships.lh_first;
- imm != NULL; imm = imm->i6mm_chain.le_next)
+ LIST_FOREACH(imm, &im6o->im6o_memberships, i6mm_chain) {
if (imm->i6mm_maddr->in6m_ifp == ifp &&
IN6_ARE_ADDR_EQUAL(&imm->i6mm_maddr->in6m_addr,
&ia))
break;
+ }
if (imm != NULL) {
error = EADDRINUSE;
break;
@@ -2660,8 +2660,7 @@ ip6_setmoptions(const struct sockopt *so
/*
* Find the membership in the membership list.
*/
- for (imm = im6o->im6o_memberships.lh_first;
- imm != NULL; imm = imm->i6mm_chain.le_next) {
+ LIST_FOREACH(imm, &im6o->im6o_memberships, i6mm_chain) {
if ((ifp == NULL || imm->i6mm_maddr->in6m_ifp == ifp) &&
IN6_ARE_ADDR_EQUAL(&imm->i6mm_maddr->in6m_addr,
&mreq.ipv6mr_multiaddr))
@@ -2691,7 +2690,7 @@ ip6_setmoptions(const struct sockopt *so
if (im6o->im6o_multicast_if_index == 0 &&
im6o->im6o_multicast_hlim == ip6_defmcasthlim &&
im6o->im6o_multicast_loop == IPV6_DEFAULT_MULTICAST_LOOP &&
- im6o->im6o_memberships.lh_first == NULL) {
+ LIST_EMPTY(&im6o->im6o_memberships)) {
free(in6p->in6p_moptions, M_IPMOPTS);
in6p->in6p_moptions = NULL;
}
@@ -2750,12 +2749,12 @@ ip6_getmoptions(struct sockopt *sopt, st
void
ip6_freemoptions(struct ip6_moptions *im6o)
{
- struct in6_multi_mship *imm;
+ struct in6_multi_mship *imm, *nimm;
if (im6o == NULL)
return;
- while ((imm = im6o->im6o_memberships.lh_first) != NULL) {
+ LIST_FOREACH_SAFE(imm, &im6o->im6o_memberships, i6mm_chain, nimm) {
LIST_REMOVE(imm, i6mm_chain);
in6_leavegroup(imm);
}
