diff options
| author | Michael Brown | 2013-08-06 16:55:23 +0200 |
|---|---|---|
| committer | Michael Brown | 2013-08-06 16:55:23 +0200 |
| commit | 03506828654a67c49471580a17fc91169b1ce96e (patch) | |
| tree | b84f4624ac09a9824c47ca4111ac84ea619f3817 /src | |
| parent | [udp] Move high-frequency debug messages to DBGLVL_EXTRA (diff) | |
| download | ipxe-03506828654a67c49471580a17fc91169b1ce96e.tar.gz ipxe-03506828654a67c49471580a17fc91169b1ce96e.tar.xz ipxe-03506828654a67c49471580a17fc91169b1ce96e.zip | |
[ipv6] Rename sin_{family,port} to sin6_{family,port} in struct sockaddr_in6
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/ipxe/in.h | 4 | ||||
| -rw-r--r-- | src/net/icmpv6.c | 2 | ||||
| -rw-r--r-- | src/net/ipv6.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/include/ipxe/in.h b/src/include/ipxe/in.h index 20f1ce267..1208ae38a 100644 --- 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 1a5aad3ba..262ffc3f8 100644 --- 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 57bf94d8d..d76e59cbd 100644 --- 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 */ |