[src/trunk]: src/sys/netinet6 Use ifatoia6 macro

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a8e07fce4522
branches:  trunk
changeset: 346496:a8e07fce4522
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Fri Jul 15 07:33:41 2016 +0000

description:
Use ifatoia6 macro

No functional change.

diffstat:

 sys/netinet6/icmp6.c   |  6 +++---
 sys/netinet6/in6_pcb.c |  6 +++---
 sys/netinet6/in6_src.c |  6 +++---
 sys/netinet6/raw_ip6.c |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diffs (108 lines):

diff -r 65f0b8068373 -r a8e07fce4522 sys/netinet6/icmp6.c
--- a/sys/netinet6/icmp6.c      Fri Jul 15 06:13:50 2016 +0000
+++ b/sys/netinet6/icmp6.c      Fri Jul 15 07:33:41 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: icmp6.c,v 1.192 2016/07/07 09:32:03 ozaki-r Exp $      */
+/*     $NetBSD: icmp6.c,v 1.193 2016/07/15 07:33:41 ozaki-r Exp $      */
 /*     $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.192 2016/07/07 09:32:03 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.193 2016/07/15 07:33:41 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -2071,7 +2071,7 @@
 
                sockaddr_in6_init(&u.sin6, &origdst, 0, 0, 0);
 
-               ia = (struct in6_ifaddr *)ifa_ifwithaddr(&u.sa);
+               ia = ifatoia6(ifa_ifwithaddr(&u.sa));
 
                if (ia == NULL)
                        ;
diff -r 65f0b8068373 -r a8e07fce4522 sys/netinet6/in6_pcb.c
--- a/sys/netinet6/in6_pcb.c    Fri Jul 15 06:13:50 2016 +0000
+++ b/sys/netinet6/in6_pcb.c    Fri Jul 15 07:33:41 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_pcb.c,v 1.145 2016/06/21 10:25:27 ozaki-r Exp $    */
+/*     $NetBSD: in6_pcb.c,v 1.146 2016/07/15 07:33:41 ozaki-r Exp $    */
 /*     $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $        */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.145 2016/06/21 10:25:27 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.146 2016/07/15 07:33:41 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -257,7 +257,7 @@
                 * deprecated addresses (default: forbid bind(2)).
                 */
                if (ia &&
-                   ((struct in6_ifaddr *)ia)->ia6_flags &
+                   ifatoia6(ia)->ia6_flags &
                    (IN6_IFF_ANYCAST|IN6_IFF_NOTREADY|IN6_IFF_DETACHED))
                        return (EADDRNOTAVAIL);
        }
diff -r 65f0b8068373 -r a8e07fce4522 sys/netinet6/in6_src.c
--- a/sys/netinet6/in6_src.c    Fri Jul 15 06:13:50 2016 +0000
+++ b/sys/netinet6/in6_src.c    Fri Jul 15 07:33:41 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_src.c,v 1.63 2016/07/04 06:48:14 ozaki-r Exp $     */
+/*     $NetBSD: in6_src.c,v 1.64 2016/07/15 07:33:41 ozaki-r Exp $     */
 /*     $KAME: in6_src.c,v 1.159 2005/10/19 01:40:32 t-momose Exp $     */
 
 /*
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.63 2016/07/04 06:48:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.64 2016/07/15 07:33:41 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -240,7 +240,7 @@
                                goto exit;
                }
 
-               ia6 = (struct in6_ifaddr *)ifa_ifwithaddr((struct sockaddr *)(&srcsock));
+               ia6 = ifatoia6(ifa_ifwithaddr((struct sockaddr *)(&srcsock)));
                if (ia6 == NULL ||
                    (ia6->ia6_flags & (IN6_IFF_ANYCAST | IN6_IFF_NOTREADY))) {
                        *errorp = EADDRNOTAVAIL;
diff -r 65f0b8068373 -r a8e07fce4522 sys/netinet6/raw_ip6.c
--- a/sys/netinet6/raw_ip6.c    Fri Jul 15 06:13:50 2016 +0000
+++ b/sys/netinet6/raw_ip6.c    Fri Jul 15 07:33:41 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raw_ip6.c,v 1.146 2016/06/21 10:25:27 ozaki-r Exp $    */
+/*     $NetBSD: raw_ip6.c,v 1.147 2016/07/15 07:33:41 ozaki-r Exp $    */
 /*     $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $        */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.146 2016/06/21 10:25:27 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.147 2016/07/15 07:33:41 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
@@ -695,7 +695,7 @@
        if (!IN6_IS_ADDR_UNSPECIFIED(&addr->sin6_addr) &&
            (ia = ifa_ifwithaddr((struct sockaddr *)addr)) == 0)
                return EADDRNOTAVAIL;
-       if (ia && ((struct in6_ifaddr *)ia)->ia6_flags &
+       if (ia && ifatoia6(ia)->ia6_flags &
            (IN6_IFF_ANYCAST|IN6_IFF_NOTREADY|
             IN6_IFF_DETACHED|IN6_IFF_DEPRECATED))
                return EADDRNOTAVAIL;