[ipv6] Rename sin_{family,port} to sin6_{family,port} in struct sockaddr_in6

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/include/ipxe/in.h b/src/include/ipxe/in.h
index 20f1ce267fe47f0792ecadc19ca708387d8f7600..1208ae38a7841fcc3813521d86e7f9a0608bdbfc 100644 (file)
--- a/src/include/ipxe/in.h
+++ b/src/include/ipxe/in.h
@@ -82,9 +82,9 @@ struct sockaddr_in6 {
         *
         * Always set to @c AF_INET6 for IPv6 addresses
         */
-       sa_family_t sin_family;
+       sa_family_t sin6_family;
        /** TCP/IP port (part of struct @c sockaddr_tcpip) */
-       uint16_t        sin_port;
+       uint16_t sin6_port;
         uint32_t        sin6_flowinfo;  /* Flow number */
         struct in6_addr sin6_addr;      /* 128-bit destination address */
         uint32_t        sin6_scope_id;  /* Scope ID */

diff --git a/src/net/icmpv6.c b/src/net/icmpv6.c
index 1a5aad3bada9f1a7d1da02d199aeb01fcb4e037c..262ffc3f8cecf7b15dfb730c766553147fd5ab40 100644 (file)
--- a/src/net/icmpv6.c
+++ b/src/net/icmpv6.c
@@ -47,7 +47,7 @@ int icmp6_send_solicit ( struct net_device *netdev, struct in6_addr *src __unuse
        nsolicit->csum = tcpip_chksum ( nsolicit, sizeof ( *nsolicit ) );
 
        /* Solicited multicast address */
-       st_dest.sin6.sin_family = AF_INET6;
+       st_dest.sin6.sin6_family = AF_INET6;
        st_dest.sin6.sin6_addr.in6_u.u6_addr8[0] = 0xff;
        st_dest.sin6.sin6_addr.in6_u.u6_addr8[2] = 0x02;
        st_dest.sin6.sin6_addr.in6_u.u6_addr16[1] = 0x0000;

diff --git a/src/net/ipv6.c b/src/net/ipv6.c
index 57bf94d8d9d5c1b891c168eb1d7eb4689a4473f2..d76e59cbdf39d2757540fd2449c6c52737cc5de7 100644 (file)
--- a/src/net/ipv6.c
+++ b/src/net/ipv6.c
@@ -332,10 +332,10 @@ static int ipv6_rx ( struct io_buffer *iobuf,
 
        /* Construct socket address */
        memset ( &src, 0, sizeof ( src ) );
-       src.sin6.sin_family = AF_INET6;
+       src.sin6.sin6_family = AF_INET6;
        src.sin6.sin6_addr = ip6hdr->src;
        memset ( &dest, 0, sizeof ( dest ) );
-       dest.sin6.sin_family = AF_INET6;
+       dest.sin6.sin6_family = AF_INET6;
        dest.sin6.sin6_addr = ip6hdr->dest;
 
        /* Strip header */