Mechanical change to use <sys/queue.h> macro API instead of

fondling implementation details.

Created with: sed(1)
Reviewed by: md5(1)

5 files changed, 11 insertions, 11 deletions

diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 108518e..b756bae 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -3012,8 +3012,8 @@ tulip_addr_filter(
 #endif
 
     multicnt = 0;
-    for (ifma = sc->tulip_if.if_multiaddrs.lh_first; ifma != NULL;
-	 ifma = ifma->ifma_link.le_next) {
+    for (ifma = LIST_FIRST(&sc->tulip_if.if_multiaddrs); ifma != NULL;
+	 ifma = LIST_NEXT(ifma, ifma_link)) {
 
 	    if (ifma->ifma_addr->sa_family == AF_LINK)
 		multicnt++;
@@ -3041,8 +3041,8 @@ tulip_addr_filter(
 	 */
 	bzero(sc->tulip_setupdata, sizeof(sc->tulip_setupdata));
 
-	for (ifma = sc->tulip_if.if_multiaddrs.lh_first; ifma != NULL;
-	     ifma = ifma->ifma_link.le_next) {
+	for (ifma = LIST_FIRST(&sc->tulip_if.if_multiaddrs); ifma != NULL;
+	     ifma = LIST_NEXT(ifma, ifma_link)) {
 
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
@@ -3092,8 +3092,8 @@ tulip_addr_filter(
 	    /*
 	     * Else can get perfect filtering for 16 addresses.
 	     */
-	    for (ifma = sc->tulip_if.if_multiaddrs.lh_first; ifma != NULL;
-		 ifma = ifma->ifma_link.le_next) {
+	    for (ifma = LIST_FIRST(&sc->tulip_if.if_multiaddrs); ifma != NULL;
+		 ifma = LIST_NEXT(ifma, ifma_link)) {
 		    if (ifma->ifma_addr->sa_family != AF_LINK)
 			    continue;
 		    addrp = LLADDR((struct sockaddr_dl *)ifma->ifma_addr);
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index ff01bf0..29f3fe3 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -450,7 +450,7 @@ static void sf_setmulti(sc)
 		i = 1;
 		/* First find the tail of the list. */
 		LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
-			if (ifma->ifma_link.le_next == NULL)
+			if (LIST_NEXT(ifma, ifma_link) == NULL)
 				break;
 		}
 		/* Now traverse the list backwards. */
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index a0dc45a..a6dba79 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -559,7 +559,7 @@ static void sk_setmulti(sc_if)
 		i = 1;
 		/* First find the tail of the list. */
 		LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
-			if (ifma->ifma_link.le_next == NULL)
+			if (LIST_NEXT(ifma, ifma_link) == NULL)
 				break;
 		}
 		/* Now traverse the list backwards. */
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index cb28d01..1d52547 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -1073,8 +1073,8 @@ static void ti_setmulti(sc)
 	CSR_WRITE_4(sc, TI_MB_HOSTINTR, 1);
 
 	/* First, zot all the existing filters. */
-	while (sc->ti_mc_listhead.slh_first != NULL) {
-		mc = sc->ti_mc_listhead.slh_first;
+	while (SLIST_FIRST(&sc->ti_mc_listhead) != NULL) {
+		mc = SLIST_FIRST(&sc->ti_mc_listhead);
 		ti_del_mcast(sc, &mc->mc_addr);
 		SLIST_REMOVE_HEAD(&sc->ti_mc_listhead, mc_entries);
 		free(mc, M_DEVBUF);
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index b4c576b..eaa3f058 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -954,7 +954,7 @@ static void tl_setmulti(sc)
 		i = 1;
 		/* First find the tail of the list. */
 		LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
-			if (ifma->ifma_link.le_next == NULL)
+			if (LIST_NEXT(ifma, ifma_link) == NULL)
 				break;
 		}
 		/* Now traverse the list backwards. */