Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[ipv6] Rename sin_{family,port} to sin6_{family,port} in struct socka…
…ddr_in6

Signed-off-by: Michael Brown <mcb30@ipxe.org>
  • Loading branch information
mcb30 committed Aug 6, 2013
1 parent e972057 commit 0350682
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/include/ipxe/in.h
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion src/net/icmpv6.c
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/net/ipv6.c
Expand Up @@ -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 */
Expand Down

0 comments on commit 0350682

Please sign in to comment.