X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/blobdiff_plain/611e7d72a35307f3415db0ee4a7b2efb263b3f3e..5785f5fb36825712d454aa00e3fc225e237465d1:/sys/netinet6/in6_var.h

diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h
index fd1ce0e3b8..3971d13267 100644
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
@@ -43,11 +43,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -130,9 +126,8 @@ struct	in6_ifaddr {
 	int	ia6_flags;
 
 	struct in6_addrlifetime ia6_lifetime;
-	struct nd_prefix *ia6_ndpr; /* back pointer to the ND prefix
-				     * (for autoconfigured addresses only)
-				     */
+	/* back pointer to the ND prefix (for autoconfigured addresses only) */
+	struct nd_prefix *ia6_ndpr;
 };
 
 /* control structure to manage address selection policy */
@@ -600,18 +595,14 @@ do { \
 		IN6_NEXT_MULTI((step), (in6m)); \
 } while(0)
 
-struct	in6_multi *in6_addmulti (struct in6_addr *, struct ifnet *,
-				     int *);
+struct	in6_multi *in6_addmulti (struct in6_addr *, struct ifnet *, int *);
 void	in6_delmulti (struct in6_multi *);
 struct	in6_multi_mship *in6_joingroup(struct ifnet *, struct in6_addr *, int *);
 int	in6_leavegroup(struct in6_multi_mship *);
 
-extern int in6_ifindex2scopeid (int);
 int	in6_mask2len(const struct in6_addr *, const u_char *);
-extern void in6_len2mask (struct in6_addr *, int);
 void	in6_control_dispatch(netmsg_t msg);
-int	in6_control (struct socket *,
-			u_long, caddr_t, struct ifnet *, struct thread *);
+int	in6_control(u_long, caddr_t, struct ifnet *, struct thread *);
 int	in6_update_ifa (struct ifnet *, struct in6_aliasreq *,
 			struct in6_ifaddr *);
 void	in6_purgeaddr (struct ifaddr *);
@@ -624,17 +615,16 @@ void	in6_setmaxmtu   (void);
 void	in6_restoremkludge (struct in6_ifaddr *, struct ifnet *);
 void	in6_purgemkludge (struct ifnet *);
 struct in6_ifaddr *in6ifa_ifpforlinklocal (struct ifnet *, int);
-struct in6_ifaddr *in6ifa_ifpwithaddr (struct ifnet *,
-					     struct in6_addr *);
+struct in6_ifaddr *in6ifa_ifpwithaddr (struct ifnet *, struct in6_addr *);
 struct in6_ifaddr *in6ifa_ifplocaladdr(const struct ifnet *,
 					const struct in6_addr *);
 struct in6_ifaddr *in6ifa_llaonifp(struct ifnet *);
 char	*ip6_sprintf (const struct in6_addr *);
-int	in6_addr2scopeid (struct ifnet *, struct in6_addr *);
+int	in6_addr2zoneid(struct ifnet *, struct in6_addr *, u_int32_t *);
 int	in6_matchlen (struct in6_addr *, struct in6_addr *);
-int	in6_are_prefix_equal (struct in6_addr *p1, struct in6_addr *p2,
-				  int len);
-void	in6_prefixlen2mask (struct in6_addr *maskp, int len);
+int	in6_are_prefix_equal(struct in6_addr *p1, struct in6_addr *p2, int len);
+void	in6_prefixlen2mask(struct in6_addr *maskp, int len);
+void	in6_newaddrmsg(struct ifaddr *);
 void	in6_ifremloop(struct ifaddr *);
 void	in6_ifaddloop(struct ifaddr *);