From 3075a916cc9d83fa46bbfee09b070b16b951c5cd Mon Sep 17 00:00:00 2001 From: itojun Date: Wed, 26 Apr 2000 05:36:41 +0000 Subject: sync with more recent kame. defer inclusion of net/if_gif.h. --- sys/netinet/in_gif.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'sys') 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 #include -#include #include #include @@ -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 -- cgit