From a5c8d51908263a5e2ea157c54ad9b7ef819669f2 Mon Sep 17 00:00:00 2001
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Wed, 8 Jan 2003 17:59:24 +0000
Subject: [PATCH] "struct route" is not sufficient.  NetBSD PR 18751

Obtained from:	KAME
MFC after:	1 days
---
 sys/netinet6/esp_rijndael.c | 1 +
 sys/netinet6/ipcomp_core.c  | 1 +
 sys/netkey/keydb.h          | 6 +++++-
 sys/netkey/keysock.c        | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sys/netinet6/esp_rijndael.c b/sys/netinet6/esp_rijndael.c
index 5b0e5fab47b..950bbe827f8 100644
--- a/sys/netinet6/esp_rijndael.c
+++ b/sys/netinet6/esp_rijndael.c
@@ -40,6 +40,7 @@
 
 #include <net/if.h>
 #include <net/route.h>
+#include <netinet/in.h>
 
 #include <netinet6/ipsec.h>
 #include <netinet6/esp.h>
diff --git a/sys/netinet6/ipcomp_core.c b/sys/netinet6/ipcomp_core.c
index 62af1bc6398..a6cdea5218e 100644
--- a/sys/netinet6/ipcomp_core.c
+++ b/sys/netinet6/ipcomp_core.c
@@ -51,6 +51,7 @@
 
 #include <net/if.h>
 #include <net/route.h>
+#include <netinet/in.h>
 #include <net/netisr.h>
 #include <net/zlib.h>
 #include <machine/cpu.h>
diff --git a/sys/netkey/keydb.h b/sys/netkey/keydb.h
index 8b36e56eb36..0690ec8d233 100644
--- a/sys/netkey/keydb.h
+++ b/sys/netkey/keydb.h
@@ -63,7 +63,11 @@ struct secashead {
 					/* SA chain */
 					/* The first of this list is newer SA */
 
-	struct route sa_route;		/* route cache */
+	union {
+		struct route sau_route;
+		struct route_in6 sau_route6;
+	} sa_u;
+#define sa_route sa_u.sau_route
 };
 
 /* Security Association */
diff --git a/sys/netkey/keysock.c b/sys/netkey/keysock.c
index 60b43c465cd..dbc48a85e11 100644
--- a/sys/netkey/keysock.c
+++ b/sys/netkey/keysock.c
@@ -50,6 +50,7 @@
 
 #include <net/raw_cb.h>
 #include <net/route.h>
+#include <netinet/in.h>
 
 #include <net/pfkeyv2.h>
 #include <netkey/keydb.h>