summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>2001-07-30 21:48:59 +0000
committerJason Wright <jason@cvs.openbsd.org>2001-07-30 21:48:59 +0000
commit703a3afee691a219f2e7466ad6055373ac5410b6 (patch)
treef9714ce985e0d866536f5deded47ca05c417aee5 /sys/net
parent65d8441866cb4f0b73695e403690e8353194c4d7 (diff)
use queue.h macros
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/if_ethersubr.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 418aae30b1e..4e28b229947 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ethersubr.c,v 1.53 2001/07/25 03:28:19 jason Exp $ */
+/* $OpenBSD: if_ethersubr.c,v 1.54 2001/07/30 21:48:58 jason Exp $ */
/* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */
/*
@@ -1054,8 +1054,7 @@ ether_ifattach(ifp)
ifp->if_hdrlen = 14;
ifp->if_mtu = ETHERMTU;
ifp->if_output = ether_output;
- for (ifa = ifp->if_addrlist.tqh_first; ifa != 0;
- ifa = ifa->ifa_list.tqe_next)
+ TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) {
if ((sdl = (struct sockaddr_dl *)ifa->ifa_addr) &&
sdl->sdl_family == AF_LINK) {
sdl->sdl_type = IFT_ETHER;
@@ -1064,6 +1063,7 @@ ether_ifattach(ifp)
LLADDR(sdl), ifp->if_addrlen);
break;
}
+ }
LIST_INIT(&((struct arpcom *)ifp)->ac_multiaddrs);
#if NBPFILTER > 0
bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
@@ -1077,7 +1077,8 @@ ether_ifdetach(ifp)
struct arpcom *ac = (struct arpcom *)ifp;
struct ether_multi *enm;
- for (enm = LIST_FIRST(&ac->ac_multiaddrs); enm;
+ for (enm = LIST_FIRST(&ac->ac_multiaddrs);
+ enm != LIST_END(&ac->ac_multiaddrs);
enm = LIST_FIRST(&ac->ac_multiaddrs)) {
LIST_REMOVE(enm, enm_list);
free(enm, M_IFMADDR);