summaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
authoritojun <itojun@NetBSD.org>2000-04-26 05:36:41 +0000
committeritojun <itojun@NetBSD.org>2000-04-26 05:36:41 +0000
commit3075a916cc9d83fa46bbfee09b070b16b951c5cd (patch)
tree376cea2bf795e702529168d1ad15e2fdf877b72e /sys/netinet
parentfad0a37405cf8272661b2ce829cf08c5fd7138a5 (diff)
sync with more recent kame. defer inclusion of net/if_gif.h.
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/in_gif.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index 349e19e992c..215d6862271 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -1,5 +1,5 @@
-/* $NetBSD: in_gif.c,v 1.13 2000/04/20 01:59:22 enami Exp $ */
-/* $KAME: in_gif.c,v 1.36 2000/04/19 04:51:58 itojun Exp $ */
+/* $NetBSD: in_gif.c,v 1.14 2000/04/26 05:36:41 itojun Exp $ */
+/* $KAME: in_gif.c,v 1.39 2000/04/26 05:33:31 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,6 @@
#include <net/if.h>
#include <net/route.h>
-#include <net/if_gif.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
@@ -381,6 +380,9 @@ gif_encapcheck4(m, off, proto, arg)
/* reject packets with broadcast on source */
#if defined(__OpenBSD__) || defined(__NetBSD__)
for (ia4 = in_ifaddr.tqh_first; ia4; ia4 = ia4->ia_list.tqe_next)
+#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3)
+ for (ia4 = TAILQ_FIRST(&in_ifaddrhead); ia4;
+ ia4 = TAILQ_NEXT(ia4, ia_link))
#else
for (ia4 = in_ifaddr; ia4 != NULL; ia4 = ia4->ia_next)
#endif