diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-20 20:04:10 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:26:29 -0500 |
commit | 09ef7fecea40c5e4c0dfe35bed3f0ed8da554cf5 (patch) | |
tree | b293f6aa012265dcb413d7dd6c0b68b1f2676b9f /net/sctp/sm_statefuns.c | |
parent | 30330ee00ce077de9d459c17125573ff618bd7a9 (diff) |
[SCTP]: Beginning of conversion to net-endian for embedded sctp_addr.
Part 1: rename sctp_chunk->source, sctp_sockaddr_entry->a,
sctp_transport->ipaddr and sctp_transport->saddr (to ..._h)
The next patch will reintroduce these fields and keep them as
net-endian mirrors of the original (renamed) ones. Split in
two patches to make sure that we hadn't forgotten any instanes.
Later in the series we'll eliminate uses of host-endian variants
(basically switching users to net-endian counterparts as we
progress through that mess). Then host-endian ones will die.
Other embedded host-endian sctp_addr will be easier to switch
directly, so we leave them alone for now.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/sm_statefuns.c')
-rw-r--r-- | net/sctp/sm_statefuns.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index b70e3258b6d3..f46072767549 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c | |||
@@ -852,7 +852,7 @@ static sctp_disposition_t sctp_sf_heartbeat(const struct sctp_endpoint *ep, | |||
852 | 852 | ||
853 | hbinfo.param_hdr.type = SCTP_PARAM_HEARTBEAT_INFO; | 853 | hbinfo.param_hdr.type = SCTP_PARAM_HEARTBEAT_INFO; |
854 | hbinfo.param_hdr.length = htons(sizeof(sctp_sender_hb_info_t)); | 854 | hbinfo.param_hdr.length = htons(sizeof(sctp_sender_hb_info_t)); |
855 | hbinfo.daddr = transport->ipaddr; | 855 | hbinfo.daddr = transport->ipaddr_h; |
856 | hbinfo.sent_at = jiffies; | 856 | hbinfo.sent_at = jiffies; |
857 | hbinfo.hb_nonce = transport->hb_nonce; | 857 | hbinfo.hb_nonce = transport->hb_nonce; |
858 | 858 | ||
@@ -1167,8 +1167,8 @@ static int sctp_sf_check_restart_addrs(const struct sctp_association *new_asoc, | |||
1167 | list_for_each(pos2, &asoc->peer.transport_addr_list) { | 1167 | list_for_each(pos2, &asoc->peer.transport_addr_list) { |
1168 | addr = list_entry(pos2, struct sctp_transport, | 1168 | addr = list_entry(pos2, struct sctp_transport, |
1169 | transports); | 1169 | transports); |
1170 | if (sctp_cmp_addr_exact(&new_addr->ipaddr, | 1170 | if (sctp_cmp_addr_exact(&new_addr->ipaddr_h, |
1171 | &addr->ipaddr)) { | 1171 | &addr->ipaddr_h)) { |
1172 | found = 1; | 1172 | found = 1; |
1173 | break; | 1173 | break; |
1174 | } | 1174 | } |
@@ -1179,7 +1179,7 @@ static int sctp_sf_check_restart_addrs(const struct sctp_association *new_asoc, | |||
1179 | 1179 | ||
1180 | /* If a new address was added, ABORT the sender. */ | 1180 | /* If a new address was added, ABORT the sender. */ |
1181 | if (!found && new_addr) { | 1181 | if (!found && new_addr) { |
1182 | sctp_sf_send_restart_abort(&new_addr->ipaddr, init, commands); | 1182 | sctp_sf_send_restart_abort(&new_addr->ipaddr_h, init, commands); |
1183 | } | 1183 | } |
1184 | 1184 | ||
1185 | /* Return success if all addresses were found. */ | 1185 | /* Return success if all addresses were found. */ |