aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-20 20:26:34 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:27:13 -0500
commit9f81bcd9429e9bb4006eb9b7df276706c5df926d (patch)
tree1f2f5ddc1c22d2b771121e7bf64afc5c837b1e0d /net/sctp
parent962c837275e8a8c1df41f1882e971636093cdee4 (diff)
[SCTP]: More trivial sctp annotations.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
-rw-r--r--net/sctp/outqueue.c2
-rw-r--r--net/sctp/sm_make_chunk.c11
-rw-r--r--net/sctp/tsnmap.c9
-rw-r--r--net/sctp/ulpevent.c2
4 files changed, 12 insertions, 12 deletions
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index 739582415bf6..c9148484b2ff 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -1632,7 +1632,7 @@ pass:
1632} 1632}
1633 1633
1634static inline int sctp_get_skip_pos(struct sctp_fwdtsn_skip *skiplist, 1634static inline int sctp_get_skip_pos(struct sctp_fwdtsn_skip *skiplist,
1635 int nskips, __u16 stream) 1635 int nskips, __be16 stream)
1636{ 1636{
1637 int i; 1637 int i;
1638 1638
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 9674e6e3205b..51cab806abd8 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -775,7 +775,7 @@ struct sctp_chunk *sctp_make_abort_no_data(
775 const struct sctp_chunk *chunk, __u32 tsn) 775 const struct sctp_chunk *chunk, __u32 tsn)
776{ 776{
777 struct sctp_chunk *retval; 777 struct sctp_chunk *retval;
778 __u32 payload; 778 __be32 payload;
779 779
780 retval = sctp_make_abort(asoc, chunk, sizeof(sctp_errhdr_t) 780 retval = sctp_make_abort(asoc, chunk, sizeof(sctp_errhdr_t)
781 + sizeof(tsn)); 781 + sizeof(tsn));
@@ -1195,10 +1195,9 @@ void sctp_chunk_assign_ssn(struct sctp_chunk *chunk)
1195 ssn = sctp_ssn_next(&chunk->asoc->ssnmap->out, sid); 1195 ssn = sctp_ssn_next(&chunk->asoc->ssnmap->out, sid);
1196 else 1196 else
1197 ssn = sctp_ssn_peek(&chunk->asoc->ssnmap->out, sid); 1197 ssn = sctp_ssn_peek(&chunk->asoc->ssnmap->out, sid);
1198 ssn = htons(ssn);
1199 } 1198 }
1200 1199
1201 chunk->subh.data_hdr->ssn = ssn; 1200 chunk->subh.data_hdr->ssn = htons(ssn);
1202 chunk->has_ssn = 1; 1201 chunk->has_ssn = 1;
1203} 1202}
1204 1203
@@ -1539,8 +1538,8 @@ malformed:
1539 ********************************************************************/ 1538 ********************************************************************/
1540 1539
1541struct __sctp_missing { 1540struct __sctp_missing {
1542 __u32 num_missing; 1541 __be32 num_missing;
1543 __u16 type; 1542 __be16 type;
1544} __attribute__((packed)); 1543} __attribute__((packed));
1545 1544
1546/* 1545/*
@@ -2364,7 +2363,7 @@ static struct sctp_chunk *sctp_make_asconf_ack(const struct sctp_association *as
2364} 2363}
2365 2364
2366/* Add response parameters to an ASCONF_ACK chunk. */ 2365/* Add response parameters to an ASCONF_ACK chunk. */
2367static void sctp_add_asconf_response(struct sctp_chunk *chunk, __u32 crr_id, 2366static void sctp_add_asconf_response(struct sctp_chunk *chunk, __be32 crr_id,
2368 __be16 err_code, sctp_addip_param_t *asconf_param) 2367 __be16 err_code, sctp_addip_param_t *asconf_param)
2369{ 2368{
2370 sctp_addip_param_t ack_param; 2369 sctp_addip_param_t ack_param;
diff --git a/net/sctp/tsnmap.c b/net/sctp/tsnmap.c
index ac4fae161bc7..42d9498c64fa 100644
--- a/net/sctp/tsnmap.c
+++ b/net/sctp/tsnmap.c
@@ -401,13 +401,14 @@ __u16 sctp_tsnmap_num_gabs(struct sctp_tsnmap *map)
401 401
402 /* Refresh the gap ack information. */ 402 /* Refresh the gap ack information. */
403 if (sctp_tsnmap_has_gap(map)) { 403 if (sctp_tsnmap_has_gap(map)) {
404 __u16 start, end;
404 sctp_tsnmap_iter_init(map, &iter); 405 sctp_tsnmap_iter_init(map, &iter);
405 while (sctp_tsnmap_next_gap_ack(map, &iter, 406 while (sctp_tsnmap_next_gap_ack(map, &iter,
406 &map->gabs[gabs].start, 407 &start,
407 &map->gabs[gabs].end)) { 408 &end)) {
408 409
409 map->gabs[gabs].start = htons(map->gabs[gabs].start); 410 map->gabs[gabs].start = htons(start);
410 map->gabs[gabs].end = htons(map->gabs[gabs].end); 411 map->gabs[gabs].end = htons(end);
411 gabs++; 412 gabs++;
412 if (gabs >= SCTP_MAX_GABS) 413 if (gabs >= SCTP_MAX_GABS)
413 break; 414 break;
diff --git a/net/sctp/ulpevent.c b/net/sctp/ulpevent.c
index a015283a9087..e255a709f1b7 100644
--- a/net/sctp/ulpevent.c
+++ b/net/sctp/ulpevent.c
@@ -351,7 +351,7 @@ struct sctp_ulpevent *sctp_ulpevent_make_remote_error(
351 struct sctp_remote_error *sre; 351 struct sctp_remote_error *sre;
352 struct sk_buff *skb; 352 struct sk_buff *skb;
353 sctp_errhdr_t *ch; 353 sctp_errhdr_t *ch;
354 __u16 cause; 354 __be16 cause;
355 int elen; 355 int elen;
356 356
357 ch = (sctp_errhdr_t *)(chunk->skb->data); 357 ch = (sctp_errhdr_t *)(chunk->skb->data);