summaryrefslogtreecommitdiff
path: root/sys/netinet/if_ether.h
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-03-05 21:48:58 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-03-05 21:48:58 +0000
commit52f635294dc2220b27898d3db1703c9464b92fb1 (patch)
tree5c2d6cca90a4bcc953c4c704201e7c2d7c08188e /sys/netinet/if_ether.h
parent84fa77ca902d7934ca42a7fdd806497b643a8421 (diff)
Use more queue macros rather than doing it by hand; ok otto@ krw@
Diffstat (limited to 'sys/netinet/if_ether.h')
-rw-r--r--sys/netinet/if_ether.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index 321e3252e03..83e7d110312 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ether.h,v 1.35 2005/03/28 06:19:58 tedu Exp $ */
+/* $OpenBSD: if_ether.h,v 1.36 2006/03/05 21:48:56 miod Exp $ */
/* $NetBSD: if_ether.h,v 1.22 1996/05/11 13:00:00 mycroft Exp $ */
/*
@@ -243,11 +243,11 @@ struct ether_multistep {
/* struct arpcom *ac; */ \
/* struct ether_multi *enm; */ \
{ \
- for ((enm) = (ac)->ac_multiaddrs.lh_first; \
- (enm) != NULL && \
+ for ((enm) = LIST_FIRST(&(ac)->ac_multiaddrs); \
+ (enm) != LIST_END(&(ac)->ac_multiaddrs) && \
(bcmp((enm)->enm_addrlo, (addrlo), ETHER_ADDR_LEN) != 0 || \
bcmp((enm)->enm_addrhi, (addrhi), ETHER_ADDR_LEN) != 0); \
- (enm) = (enm)->enm_list.le_next); \
+ (enm) = LIST_NEXT((enm), enm_list)); \
}
/*
@@ -262,7 +262,7 @@ struct ether_multistep {
/* struct ether_multi *enm; */ \
{ \
if (((enm) = (step).e_enm) != NULL) \
- (step).e_enm = (enm)->enm_list.le_next; \
+ (step).e_enm = LIST_NEXT((enm), enm_list); \
}
#define ETHER_FIRST_MULTI(step, ac, enm) \
@@ -270,7 +270,7 @@ struct ether_multistep {
/* struct arpcom *ac; */ \
/* struct ether_multi *enm; */ \
{ \
- (step).e_enm = (ac)->ac_multiaddrs.lh_first; \
+ (step).e_enm = LIST_FIRST(&(ac)->ac_multiaddrs); \
ETHER_NEXT_MULTI((step), (enm)); \
}