Module Name: src
Committed By: snj
Date: Fri Jun 5 16:21:52 UTC 2009
Modified Files:
src/sys/net80211 [netbsd-4-0]: ieee80211_netbsd.h
src/sys/sys [netbsd-4-0]: queue.h
Log Message:
Pull up following revision(s) (requested by joerg in ticket #1321):
sys/net80211/ieee80211_netbsd.h: revision 1.15
sys/sys/queue.h: revision 1.49
move TAILQ_FOREACH_SAFE -> sys/queue.h
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.28.1 src/sys/net80211/ieee80211_netbsd.h
cvs rdiff -u -r1.45.14.1 -r1.45.14.1.4.1 src/sys/sys/queue.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net80211/ieee80211_netbsd.h
diff -u src/sys/net80211/ieee80211_netbsd.h:1.10 src/sys/net80211/ieee80211_netbsd.h:1.10.28.1
--- src/sys/net80211/ieee80211_netbsd.h:1.10 Thu Mar 2 03:38:48 2006
+++ src/sys/net80211/ieee80211_netbsd.h Fri Jun 5 16:21:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_netbsd.h,v 1.10 2006/03/02 03:38:48 dyoung Exp $ */
+/* $NetBSD: ieee80211_netbsd.h,v 1.10.28.1 2009/06/05 16:21:52 snj Exp $ */
/*-
* Copyright (c) 2003-2005 Sam Leffler, Errno Consulting
* All rights reserved.
@@ -256,11 +256,6 @@
#define ticks hardclock_ticks
#define ovbcopy(__src, __dst, __n) ((void)memmove(__dst, __src, __n))
-#define TAILQ_FOREACH_SAFE(var, head, field, nextvar) \
- for (var = TAILQ_FIRST(head); \
- var != NULL && (nextvar = TAILQ_NEXT(var, field), 1); \
- var = nextvar)
-
void if_printf(struct ifnet *, const char *, ...);
void m_align(struct mbuf *, int);
int m_append(struct mbuf *, int, const caddr_t);
Index: src/sys/sys/queue.h
diff -u src/sys/sys/queue.h:1.45.14.1 src/sys/sys/queue.h:1.45.14.1.4.1
--- src/sys/sys/queue.h:1.45.14.1 Wed Jul 18 20:13:24 2007
+++ src/sys/sys/queue.h Fri Jun 5 16:21:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: queue.h,v 1.45.14.1 2007/07/18 20:13:24 liamjfoy Exp $ */
+/* $NetBSD: queue.h,v 1.45.14.1.4.1 2009/06/05 16:21:52 snj Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -497,6 +497,11 @@
(var); \
(var) = ((var)->field.tqe_next))
+#define TAILQ_FOREACH_SAFE(var, head, field, next) \
+ for ((var) = ((head)->tqh_first); \
+ (var) != NULL && ((next) = TAILQ_NEXT(var, field), 1); \
+ (var) = (next))
+
#define TAILQ_FOREACH_REVERSE(var, head, headname, field) \
for ((var) = (*(((struct headname *)((head)->tqh_last))->tqh_last)); \
(var); \
