diff options
| author | jhb <jhb@FreeBSD.org> | 2012-01-03 16:22:29 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2012-01-03 16:22:29 +0000 |
| commit | dd61fe0873effbc4d17cf7dabc455d8155066adb (patch) | |
| tree | 147f8ee166359ccc86440ac1c50c43e5b2ee2acc /sys/netinet | |
| parent | e1ab2f9fed65fbeb9f7eaaa5a4272259f636e275 (diff) | |
| download | FreeBSD-src-dd61fe0873effbc4d17cf7dabc455d8155066adb.zip FreeBSD-src-dd61fe0873effbc4d17cf7dabc455d8155066adb.tar.gz | |
Use TAILQ_FOREACH() instead of TAILQ_FOREACH_SAFE() for some loops that
do not modify the queues they iterate over.
Submitted by: glebius
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/igmp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index e50d158..79f6db5 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -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_multi *inm, struct ifqueue *ifscq) 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 igmp_ifinfo *igi) 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; |
