Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 3 Jan 2012 16:22:29 +0000 (UTC)
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r229390 - in head/sys: netinet netinet6
Message-ID:  <201201031622.q03GMTIs031422@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jhb
Date: Tue Jan  3 16:22:29 2012
New Revision: 229390
URL: http://svn.freebsd.org/changeset/base/229390

Log:
  Use TAILQ_FOREACH() instead of TAILQ_FOREACH_SAFE() for some loops that
  do not modify the queues they iterate over.
  
  Submitted by:	glebius

Modified:
  head/sys/netinet/igmp.c
  head/sys/netinet6/in6.c
  head/sys/netinet6/mld6.c

Modified: head/sys/netinet/igmp.c
==============================================================================
--- head/sys/netinet/igmp.c	Tue Jan  3 13:16:47 2012	(r229389)
+++ head/sys/netinet/igmp.c	Tue Jan  3 16:22:29 2012	(r229390)
@@ -1642,7 +1642,7 @@ igmp_fasttimo_vnet(void)
 	struct ifqueue		 qrq;	/* Query response packets */
 	struct ifnet		*ifp;
 	struct igmp_ifinfo	*igi;
-	struct ifmultiaddr	*ifma, *tifma;
+	struct ifmultiaddr	*ifma;
 	struct in_multi		*inm;
 	int			 loop, uri_fasthz;
 
@@ -1709,8 +1709,7 @@ igmp_fasttimo_vnet(void)
 		}
 
 		IF_ADDR_LOCK(ifp);
-		TAILQ_FOREACH_SAFE(ifma, &ifp->if_multiaddrs, ifma_link,
-		    tifma) {
+		TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 			if (ifma->ifma_addr->sa_family != AF_INET ||
 			    ifma->ifma_protospec == NULL)
 				continue;
@@ -3321,7 +3320,7 @@ igmp_v3_merge_state_changes(struct in_mu
 static void
 igmp_v3_dispatch_general_query(struct igmp_ifinfo *igi)
 {
-	struct ifmultiaddr	*ifma, *tifma;
+	struct ifmultiaddr	*ifma;
 	struct ifnet		*ifp;
 	struct in_multi		*inm;
 	int			 retval, loop;
@@ -3335,7 +3334,7 @@ igmp_v3_dispatch_general_query(struct ig
 	ifp = igi->igi_ifp;
 
 	IF_ADDR_LOCK(ifp);
-	TAILQ_FOREACH_SAFE(ifma, &ifp->if_multiaddrs, ifma_link, tifma) {
+	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_INET ||
 		    ifma->ifma_protospec == NULL)
 			continue;

Modified: head/sys/netinet6/in6.c
==============================================================================
--- head/sys/netinet6/in6.c	Tue Jan  3 13:16:47 2012	(r229389)
+++ head/sys/netinet6/in6.c	Tue Jan  3 16:22:29 2012	(r229390)
@@ -1325,7 +1325,7 @@ in6_purgeaddr(struct ifaddr *ifa)
 	struct sockaddr_in6 mltaddr, mltmask;
 	int plen, error;
 	struct rtentry *rt;
-	struct ifaddr *ifa0, *nifa;
+	struct ifaddr *ifa0;
 
 	if (ifa->ifa_carp)
 		(*carp_detach_p)(ifa);
@@ -1336,7 +1336,7 @@ in6_purgeaddr(struct ifaddr *ifa)
 	 * address routes
 	 */
 	IF_ADDR_LOCK(ifp);
-	TAILQ_FOREACH_SAFE(ifa0, &ifp->if_addrhead, ifa_link, nifa) {
+	TAILQ_FOREACH(ifa0, &ifp->if_addrhead, ifa_link) {
 		if ((ifa0->ifa_addr->sa_family != AF_INET6) ||
 		    memcmp(&satosin6(ifa0->ifa_addr)->sin6_addr,
 			   &ia->ia_addr.sin6_addr, 

Modified: head/sys/netinet6/mld6.c
==============================================================================
--- head/sys/netinet6/mld6.c	Tue Jan  3 13:16:47 2012	(r229389)
+++ head/sys/netinet6/mld6.c	Tue Jan  3 16:22:29 2012	(r229390)
@@ -2976,7 +2976,7 @@ mld_v2_merge_state_changes(struct in6_mu
 static void
 mld_v2_dispatch_general_query(struct mld_ifinfo *mli)
 {
-	struct ifmultiaddr	*ifma, *tifma;
+	struct ifmultiaddr	*ifma;
 	struct ifnet		*ifp;
 	struct in6_multi	*inm;
 	int			 retval;
@@ -2990,7 +2990,7 @@ mld_v2_dispatch_general_query(struct mld
 	ifp = mli->mli_ifp;
 
 	IF_ADDR_LOCK(ifp);
-	TAILQ_FOREACH_SAFE(ifma, &ifp->if_multiaddrs, ifma_link, tifma) {
+	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_INET6 ||
 		    ifma->ifma_protospec == NULL)
 			continue;

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