- Move definition of V_deembed_scopeid to scope6_var.h.

- Deembed scope id in L3 address in in6_lltable_dump().
- Simplify scope id recovery in rtsock routines.
- Remove embedded scope id handling in ndp(8) and route(8) completely.

1 files changed, 5 insertions, 0 deletions

diff --git a/sys/netinet6/scope6_var.h b/sys/netinet6/scope6_var.h
index ae337b8..87de8d7 100644
--- a/sys/netinet6/scope6_var.h
+++ b/sys/netinet6/scope6_var.h
@@ -34,6 +34,8 @@
 #define _NETINET6_SCOPE6_VAR_H_
 
 #ifdef _KERNEL
+#include <net/vnet.h>
+
 struct scope6_id {
 	/*
 	 * 16 is correspondent to 4bit multicast scope field.
@@ -42,6 +44,9 @@ struct scope6_id {
 	u_int32_t s6id_list[16];
 };
 
+VNET_DECLARE(int, deembed_scopeid);
+#define V_deembed_scopeid       VNET(deembed_scopeid)
+
 void	scope6_init(void);
 struct scope6_id *scope6_ifattach(struct ifnet *);
 void	scope6_ifdetach(struct scope6_id *);