[src/trunk]: src/sys/netinet6 avoid some of typecasting from in6_ifaddr to if...

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

details:   https://anonhg.NetBSD.org/src/rev/d3eaeeeeb2e3
branches:  trunk
changeset: 481715:d3eaeeeeb2e3
user:      itojun <itojun%NetBSD.org@localhost>
date:      Fri Feb 04 08:54:04 2000 +0000

description:
avoid some of typecasting from in6_ifaddr to ifaddr.

diffstat:

 sys/netinet6/in6.c |  16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diffs (52 lines):

diff -r 9e9a4dbdb277 -r d3eaeeeeb2e3 sys/netinet6/in6.c
--- a/sys/netinet6/in6.c        Fri Feb 04 08:45:41 2000 +0000
+++ b/sys/netinet6/in6.c        Fri Feb 04 08:54:04 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6.c,v 1.14 2000/02/02 23:28:10 thorpej Exp $ */
+/*     $NetBSD: in6.c,v 1.15 2000/02/04 08:54:04 itojun Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -408,7 +408,7 @@
 int    in6_interfaces;         /* number of external internet interfaces */
 
 #define ifa2ia6(ifa)   ((struct in6_ifaddr *)(ifa))
-#define ia62ifa(ia6)   ((struct ifaddr *)(ia6))
+#define ia62ifa(ia6)   (&(((ia6)->ia_ifa))
 
 int
 in6_control(so, cmd, data, ifp, p)
@@ -520,13 +520,7 @@
                        }
                }
        }
-#if 0
-       if (ifra->ifra_addr.sin6_family == AF_INET6) {
-               ia = in6ifa_ifpwithaddr(ifp, &ifra->ifra_addr.sin6_addr);
-       }
-#else
        ia = in6ifa_ifpwithaddr(ifp, &ifra->ifra_addr.sin6_addr);
-#endif
 
        switch (cmd) {
 
@@ -561,8 +555,8 @@
                                in6_ifaddr = ia;
                        IFAREF(&ia->ia_ifa);
 
-                       TAILQ_INSERT_TAIL(&ifp->if_addrlist,
-                               (struct ifaddr *)ia, ifa_list);
+                       TAILQ_INSERT_TAIL(&ifp->if_addrlist, &ia->ia_ifa,
+                           ifa_list);
                        IFAREF(&ia->ia_ifa);
 
                        if ((ifp->if_flags & IFF_LOOPBACK) == 0)
@@ -843,7 +837,7 @@
                case IFT_PPP:
 #endif
                        ia->ia6_flags |= IN6_IFF_TENTATIVE;
-                       nd6_dad_start((struct ifaddr *)ia, NULL);
+                       nd6_dad_start(&ia->ia_ifa, NULL);
                        break;
                case IFT_FAITH:
                case IFT_GIF: