[src/trunk]: src/sys/netinet sync with more recent kame. defer inclusion of ...

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f35ce87f367e
branches:  trunk
changeset: 485363:f35ce87f367e
user:      itojun <itojun%NetBSD.org@localhost>
date:      Wed Apr 26 05:36:41 2000 +0000

description:
sync with more recent kame.  defer inclusion of net/if_gif.h.

diffstat:

 sys/netinet/in_gif.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 9fdf1e70da9b -r f35ce87f367e sys/netinet/in_gif.c
--- a/sys/netinet/in_gif.c      Wed Apr 26 05:28:03 2000 +0000
+++ b/sys/netinet/in_gif.c      Wed Apr 26 05:36:41 2000 +0000
@@ -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 @@
        /* 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