Use LIST_FOREACH() to traverse ifp->if_multiaddrs list, instead of

<sys/queue.h> implementation details.

Created with:   /usr/sbin/sed
Reviewed with:  /sbin/md5

13 files changed, 18 insertions, 36 deletions

diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c
index 0745fde..f66e65d 100644
--- a/sys/pci/if_dc.c
+++ b/sys/pci/if_dc.c
@@ -1051,8 +1051,7 @@ void dc_setfilt_21143(sc)
 	else
 		DC_CLRBIT(sc, DC_NETCFG, DC_NETCFG_RX_ALLMULTI);
 
-	for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
-	    ifma = ifma->ifma_link.le_next) {
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
 		h = dc_crc_le(sc,
@@ -1123,8 +1122,7 @@ void dc_setfilt_admtek(sc)
 		return;
 
 	/* now program new ones */
-	for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
-	    ifma = ifma->ifma_link.le_next) {
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
 		h = dc_crc_be(LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
@@ -1192,8 +1190,7 @@ void dc_setfilt_asix(sc)
 		return;
 
 	/* now program new ones */
-	for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
-	    ifma = ifma->ifma_link.le_next) {
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
 		h = dc_crc_be(LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
@@ -1247,8 +1244,7 @@ void dc_setfilt_xircom(sc)
 	else
 		DC_CLRBIT(sc, DC_NETCFG, DC_NETCFG_RX_ALLMULTI);
 
-	for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
-	    ifma = ifma->ifma_link.le_next) {
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
 		h = dc_crc_le(sc,
diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c
index b472e5b..0149221 100644
--- a/sys/pci/if_fxp.c
+++ b/sys/pci/if_fxp.c
@@ -1907,8 +1907,7 @@ fxp_mc_setup(sc)
 
 	nmcasts = 0;
 	if (!sc->all_mcasts) {
-		for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
-		    ifma = ifma->ifma_link.le_next) {
+		LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 			if (ifma->ifma_addr->sa_family != AF_LINK)
 				continue;
 			if (nmcasts >= MAXMCADDR) {
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c
index af893fd..0934bbf 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -343,8 +343,7 @@ static void pcn_setmulti(sc)
 		pcn_csr_write(sc, PCN_CSR_MAR0 + i, 0);
 
 	/* now program new ones */
-	for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
-	    ifma = ifma->ifma_link.le_next) {
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
 		h = pcn_crc(LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 5463f07..d3a51ac 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -719,8 +719,7 @@ static void rl_setmulti(sc)
 	CSR_WRITE_4(sc, RL_MAR4, 0);
 
 	/* now program new ones */
-	for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
-				ifma = ifma->ifma_link.le_next) {
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
 		h = rl_calchash(LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index b7f6d36..ff01bf0 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -449,8 +449,7 @@ static void sf_setmulti(sc)
 	} else {
 		i = 1;
 		/* First find the tail of the list. */
-		for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
-					ifma = ifma->ifma_link.le_next) {
+		LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 			if (ifma->ifma_link.le_next == NULL)
 				break;
 		}
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index d271e47..cbbe36d 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -521,8 +521,7 @@ static void sis_setmulti_ns(sc)
 		CSR_WRITE_4(sc, SIS_RXFILT_DATA, 0);
 	}
 
-	for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
-	    ifma = ifma->ifma_link.le_next) {
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
 		h = sis_crc(sc, LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
@@ -564,8 +563,7 @@ static void sis_setmulti_sis(sc)
 	}
 
 	/* now program new ones */
-	for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
-	    ifma = ifma->ifma_link.le_next) {
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
 		h = sis_crc(sc, LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index f09df99..a0dc45a 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -558,8 +558,7 @@ static void sk_setmulti(sc_if)
 	} else {
 		i = 1;
 		/* First find the tail of the list. */
-		for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
-					ifma = ifma->ifma_link.le_next) {
+		LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 			if (ifma->ifma_link.le_next == NULL)
 				break;
 		}
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 017ac06..ddaa2c4 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -588,8 +588,7 @@ static void ste_setmulti(sc)
 	CSR_WRITE_4(sc, STE_MAR1, 0);
 
 	/* now program new ones */
-	for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
-	    ifma = ifma->ifma_link.le_next) {
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
 		h = ste_calchash(LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index 9b29e09..cb28d01 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -1081,8 +1081,7 @@ static void ti_setmulti(sc)
 	}
 
 	/* Now program new ones. */
-	for (ifma = ifp->if_multiaddrs.lh_first;
-	    ifma != NULL; ifma = ifma->ifma_link.le_next) {
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
 		mc = malloc(sizeof(struct ti_mc_entry), M_DEVBUF, M_NOWAIT);
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index ccc7069..b4c576b 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -953,8 +953,7 @@ static void tl_setmulti(sc)
 	} else {
 		i = 1;
 		/* First find the tail of the list. */
-		for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
-					ifma = ifma->ifma_link.le_next) {
+		LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 			if (ifma->ifma_link.le_next == NULL)
 				break;
 		}
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index 9e5ee21..8ea9944 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -530,8 +530,7 @@ static void vr_setmulti(sc)
 	CSR_WRITE_4(sc, VR_MAR1, 0);
 
 	/* now program new ones */
-	for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
-				ifma = ifma->ifma_link.le_next) {
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
 		h = vr_calchash(LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index fecc20d..7f93cb0 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -641,8 +641,7 @@ static void wb_setmulti(sc)
 	CSR_WRITE_4(sc, WB_MAR1, 0);
 
 	/* now program new ones */
-	for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
-				ifma = ifma->ifma_link.le_next) {
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
 		h = wb_calchash(LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index c6abf6f..1fc62b3 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -808,8 +808,7 @@ static void xl_setmulti(sc)
 		return;
 	}
 
-	for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
-				ifma = ifma->ifma_link.le_next)
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link)
 		mcnt++;
 
 	if (mcnt)
@@ -852,8 +851,7 @@ static void xl_setmulti_hash(sc)
 		CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RX_SET_HASH|i);
 
 	/* now program new ones */
-	for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
-				ifma = ifma->ifma_link.le_next) {
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
 		h = xl_calchash(LLADDR((struct sockaddr_dl *)ifma->ifma_addr));