Module Name: src
Committed By: ozaki-r
Date: Tue Jul 29 05:56:59 UTC 2014
Modified Files:
src/sys/net: if.c
Log Message:
Use IFADDR_FOREACH
To generate a diff of this commit:
cvs rdiff -u -r1.286 -r1.287 src/sys/net/if.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.286 src/sys/net/if.c:1.287
--- src/sys/net/if.c:1.286 Mon Jul 28 14:24:48 2014
+++ src/sys/net/if.c Tue Jul 29 05:56:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.286 2014/07/28 14:24:48 ozaki-r Exp $ */
+/* $NetBSD: if.c,v 1.287 2014/07/29 05:56:58 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.286 2014/07/28 14:24:48 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.287 2014/07/29 05:56:58 ozaki-r Exp $");
#include "opt_inet.h"
@@ -690,10 +690,9 @@ if_deactivate(struct ifnet *ifp)
void
if_purgeaddrs(struct ifnet *ifp, int family, void (*purgeaddr)(struct ifaddr *))
{
- struct ifaddr *ifa, *nifa;
+ struct ifaddr *ifa;
- for (ifa = IFADDR_FIRST(ifp); ifa != NULL; ifa = nifa) {
- nifa = IFADDR_NEXT(ifa);
+ IFADDR_FOREACH(ifa, ifp) {
if (ifa->ifa_addr->sa_family != family)
continue;
(*purgeaddr)(ifa);