From 52b9562b83c993486f736eba2cbcf03ad65fbcec Mon Sep 17 00:00:00 2001
From: kmacy <kmacy@FreeBSD.org>
Date: Wed, 15 Apr 2009 20:34:19 +0000
Subject: [PATCH] add an llentry to struct route{_in6} to allow it to be passed
 around with the rtentry

---
 UPDATING                   | 5 +++++
 sys/net/route.h            | 1 +
 sys/netinet/sctp_structs.h | 1 +
 sys/netinet6/in6.h         | 1 +
 sys/sys/param.h            | 2 +-
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index aef112da0277..a3493333f3a2 100644
--- a/UPDATING
+++ b/UPDATING
@@ -22,6 +22,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW:
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090415:
+	Add an llentry to struct route and struct route_in6. Modules
+	embedding a struct route will need to be recompiled. 
+	Bump __FreeBSD_version to 800079.
+
 20090414:
 	The size of rt_metrics_lite and by extension rtentry has changed.
 	Networking administration apps will need to be recompiled.
diff --git a/sys/net/route.h b/sys/net/route.h
index 26247882b8e5..f81ae1b65381 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -47,6 +47,7 @@
  */
 struct route {
 	struct	rtentry *ro_rt;
+	struct	llentry *ro_lle;
 	struct	sockaddr ro_dst;
 };
 
diff --git a/sys/netinet/sctp_structs.h b/sys/netinet/sctp_structs.h
index 24ae10f13882..59725f5d992e 100644
--- a/sys/netinet/sctp_structs.h
+++ b/sys/netinet/sctp_structs.h
@@ -146,6 +146,7 @@ struct sctp_asconf_iterator {
 
 struct sctp_net_route {
 	sctp_rtentry_t *ro_rt;
+	void *ro_lle;
 	union sctp_sockstore _l_addr;	/* remote peer addr */
 	struct sctp_ifa *_s_addr;	/* our selected src addr */
 };
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index ffdb37f4dfa2..04a68d886971 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -371,6 +371,7 @@ extern const struct in6_addr in6addr_linklocal_allrouters;
 #if __BSD_VISIBLE
 struct route_in6 {
 	struct	rtentry *ro_rt;
+	struct	llentry *ro_lle;
 	struct	sockaddr_in6 ro_dst;
 };
 #endif
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 8703c30dbc08..1220c7bd7076 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -57,7 +57,7 @@
  *		is created, otherwise 1.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 800078	/* Master, propagated to newvers */
+#define __FreeBSD_version 800079	/* Master, propagated to newvers */
 
 #ifndef LOCORE
 #include <sys/types.h>