diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-20 20:22:43 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:27:01 -0500 |
commit | b3f5b3b6654422bb0a6ef745fe4d11a4f01d006a (patch) | |
tree | 258b35b5b3eb721db94872f1a86806175b0a5ef4 /net/sctp/associola.c | |
parent | 74af924ab6562717ef9aab1061ec05bbbf31d979 (diff) |
[SCTP]: Trivial ->ipaddr_h -> ->ipaddr conversions.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/associola.c')
-rw-r--r-- | net/sctp/associola.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 5b8971be9775..fa7cda4b1813 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c | |||
@@ -487,8 +487,8 @@ void sctp_assoc_rm_peer(struct sctp_association *asoc, | |||
487 | SCTP_DEBUG_PRINTK_IPADDR("sctp_assoc_rm_peer:association %p addr: ", | 487 | SCTP_DEBUG_PRINTK_IPADDR("sctp_assoc_rm_peer:association %p addr: ", |
488 | " port: %d\n", | 488 | " port: %d\n", |
489 | asoc, | 489 | asoc, |
490 | (&peer->ipaddr_h), | 490 | (&peer->ipaddr), |
491 | peer->ipaddr_h.v4.sin_port); | 491 | ntohs(peer->ipaddr.v4.sin_port)); |
492 | 492 | ||
493 | /* If we are to remove the current retran_path, update it | 493 | /* If we are to remove the current retran_path, update it |
494 | * to the next peer before removing this peer from the list. | 494 | * to the next peer before removing this peer from the list. |
@@ -1136,8 +1136,8 @@ void sctp_assoc_update_retran_path(struct sctp_association *asoc) | |||
1136 | " %p addr: ", | 1136 | " %p addr: ", |
1137 | " port: %d\n", | 1137 | " port: %d\n", |
1138 | asoc, | 1138 | asoc, |
1139 | (&t->ipaddr_h), | 1139 | (&t->ipaddr), |
1140 | t->ipaddr_h.v4.sin_port); | 1140 | ntohs(t->ipaddr.v4.sin_port)); |
1141 | } | 1141 | } |
1142 | 1142 | ||
1143 | /* Choose the transport for sending a INIT packet. */ | 1143 | /* Choose the transport for sending a INIT packet. */ |
@@ -1161,8 +1161,8 @@ struct sctp_transport *sctp_assoc_choose_init_transport( | |||
1161 | " %p addr: ", | 1161 | " %p addr: ", |
1162 | " port: %d\n", | 1162 | " port: %d\n", |
1163 | asoc, | 1163 | asoc, |
1164 | (&t->ipaddr_h), | 1164 | (&t->ipaddr), |
1165 | t->ipaddr_h.v4.sin_port); | 1165 | ntohs(t->ipaddr.v4.sin_port)); |
1166 | 1166 | ||
1167 | return t; | 1167 | return t; |
1168 | } | 1168 | } |
@@ -1307,7 +1307,7 @@ int sctp_assoc_set_bind_addr_from_ep(struct sctp_association *asoc, | |||
1307 | /* Use scoping rules to determine the subset of addresses from | 1307 | /* Use scoping rules to determine the subset of addresses from |
1308 | * the endpoint. | 1308 | * the endpoint. |
1309 | */ | 1309 | */ |
1310 | scope = sctp_scope(&asoc->peer.active_path->ipaddr_h); | 1310 | scope = sctp_scope(&asoc->peer.active_path->ipaddr); |
1311 | flags = (PF_INET6 == asoc->base.sk->sk_family) ? SCTP_ADDR6_ALLOWED : 0; | 1311 | flags = (PF_INET6 == asoc->base.sk->sk_family) ? SCTP_ADDR6_ALLOWED : 0; |
1312 | if (asoc->peer.ipv4_address) | 1312 | if (asoc->peer.ipv4_address) |
1313 | flags |= SCTP_ADDR4_PEERSUPP; | 1313 | flags |= SCTP_ADDR4_PEERSUPP; |