Another round of the <sys/queue.h> FOREACH transmogriffer.

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

7 files changed, 9 insertions, 18 deletions

diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index b756bae..714947b 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -3012,8 +3012,7 @@ tulip_addr_filter(
 #endif
 
     multicnt = 0;
-    for (ifma = LIST_FIRST(&sc->tulip_if.if_multiaddrs); ifma != NULL;
-	 ifma = LIST_NEXT(ifma, ifma_link)) {
+    LIST_FOREACH(ifma, &sc->tulip_if.if_multiaddrs, ifma_link) {
 
 	    if (ifma->ifma_addr->sa_family == AF_LINK)
 		multicnt++;
@@ -3041,8 +3040,7 @@ tulip_addr_filter(
 	 */
 	bzero(sc->tulip_setupdata, sizeof(sc->tulip_setupdata));
 
-	for (ifma = LIST_FIRST(&sc->tulip_if.if_multiaddrs); ifma != NULL;
-	     ifma = LIST_NEXT(ifma, ifma_link)) {
+	LIST_FOREACH(ifma, &sc->tulip_if.if_multiaddrs, ifma_link) {
 
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
@@ -3092,8 +3090,7 @@ tulip_addr_filter(
 	    /*
 	     * Else can get perfect filtering for 16 addresses.
 	     */
-	    for (ifma = LIST_FIRST(&sc->tulip_if.if_multiaddrs); ifma != NULL;
-		 ifma = LIST_NEXT(ifma, ifma_link)) {
+	    LIST_FOREACH(ifma, &sc->tulip_if.if_multiaddrs, 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_pcn.c b/sys/pci/if_pcn.c
index 0934bbf..0da955b 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -1245,8 +1245,7 @@ static int pcn_ifmedia_upd(ifp)
 	sc->pcn_link = 0;
 	if (mii->mii_instance) {
 		struct mii_softc        *miisc;
-		for (miisc = LIST_FIRST(&mii->mii_phys); miisc != NULL;
-		    miisc = LIST_NEXT(miisc, mii_list))
+		LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
 			mii_phy_reset(miisc);
 	}
 	mii_mediachg(mii);
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index 29f3fe3..fbaac99 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -492,8 +492,7 @@ static int sf_ifmedia_upd(ifp)
 	sc->sf_link = 0;
 	if (mii->mii_instance) {
 		struct mii_softc        *miisc;
-		for (miisc = LIST_FIRST(&mii->mii_phys); miisc != NULL;
-		    miisc = LIST_NEXT(miisc, mii_list))
+		LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
 			mii_phy_reset(miisc);
 	}
 	mii_mediachg(mii);
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index cbbe36d..32ed486 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -1499,8 +1499,7 @@ static int sis_ifmedia_upd(ifp)
 	sc->sis_link = 0;
 	if (mii->mii_instance) {
 		struct mii_softc	*miisc;
-		for (miisc = LIST_FIRST(&mii->mii_phys); miisc != NULL;
-		    miisc = LIST_NEXT(miisc, mii_list))
+		LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
 			mii_phy_reset(miisc);
 	}
 	mii_mediachg(mii);
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index ddaa2c4..8a14d01 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -441,8 +441,7 @@ static int ste_ifmedia_upd(ifp)
 	sc->ste_link = 0;
 	if (mii->mii_instance) {
 		struct mii_softc	*miisc;
-		for (miisc = LIST_FIRST(&mii->mii_phys); miisc != NULL;
-		    miisc = LIST_NEXT(miisc, mii_list))
+		LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
 			mii_phy_reset(miisc);
 	}
 	mii_mediachg(mii);
diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c
index ca2a89d..934b943 100644
--- a/sys/pci/if_tx.c
+++ b/sys/pci/if_tx.c
@@ -1340,8 +1340,7 @@ epic_init(sc)
 	mii = device_get_softc(sc->miibus);
         if (mii->mii_instance) {
 		struct mii_softc	*miisc;
-		for (miisc = LIST_FIRST(&mii->mii_phys); miisc != NULL;
-		     miisc = LIST_NEXT(miisc, mii_list))
+		LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
 			mii_phy_reset(miisc);
 	}
 
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index 7f93cb0..67e0b57 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -741,8 +741,7 @@ static void wb_reset(sc)
 
         if (mii->mii_instance) {
                 struct mii_softc        *miisc;
-                for (miisc = LIST_FIRST(&mii->mii_phys); miisc != NULL;
-                                miisc = LIST_NEXT(miisc, mii_list))
+                LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
                         mii_phy_reset(miisc);
         }