Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f81bcd9 authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[SCTP]: More trivial sctp annotations. 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 962c8372

net/sctp/outqueue.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1632,7 +1632,7 @@ pass: 
}

}





static inline int sctp_get_skip_pos(struct sctp_fwdtsn_skip *skiplist,

static inline int sctp_get_skip_pos(struct sctp_fwdtsn_skip *skiplist,

				    int nskips, __u16 stream)

				    int nskips, __be16 stream)

{

{

	int i;

	int i;

net/sctp/sm_make_chunk.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -775,7 +775,7 @@ struct sctp_chunk *sctp_make_abort_no_data( 
	const struct sctp_chunk *chunk, __u32 tsn)

	const struct sctp_chunk *chunk, __u32 tsn)

{

{

	struct sctp_chunk *retval;

	struct sctp_chunk *retval;

	__u32 payload;

	__be32 payload;





	retval = sctp_make_abort(asoc, chunk, sizeof(sctp_errhdr_t)

	retval = sctp_make_abort(asoc, chunk, sizeof(sctp_errhdr_t)

				 + sizeof(tsn));

				 + sizeof(tsn));
@@ -1195,10 +1195,9 @@ void sctp_chunk_assign_ssn(struct sctp_chunk *chunk) 
			ssn = sctp_ssn_next(&chunk->asoc->ssnmap->out, sid);

			ssn = sctp_ssn_next(&chunk->asoc->ssnmap->out, sid);

		else

		else

			ssn = sctp_ssn_peek(&chunk->asoc->ssnmap->out, sid);

			ssn = sctp_ssn_peek(&chunk->asoc->ssnmap->out, sid);

		ssn = htons(ssn);

	}

	}





	chunk->subh.data_hdr->ssn = ssn;

	chunk->subh.data_hdr->ssn = htons(ssn);

	chunk->has_ssn = 1;

	chunk->has_ssn = 1;

}

}
@@ -1539,8 +1538,8 @@ malformed: 
 ********************************************************************/

 ********************************************************************/





struct __sctp_missing {

struct __sctp_missing {

	__u32 num_missing;

	__be32 num_missing;

	__u16 type;

	__be16 type;

}  __attribute__((packed));

}  __attribute__((packed));





/*

/*
@@ -2364,7 +2363,7 @@ static struct sctp_chunk *sctp_make_asconf_ack(const struct sctp_association *as 
}

}





/* Add response parameters to an ASCONF_ACK chunk. */

/* Add response parameters to an ASCONF_ACK chunk. */

static void sctp_add_asconf_response(struct sctp_chunk *chunk, __u32 crr_id,

static void sctp_add_asconf_response(struct sctp_chunk *chunk, __be32 crr_id,

			      __be16 err_code, sctp_addip_param_t *asconf_param)

			      __be16 err_code, sctp_addip_param_t *asconf_param)

{

{

	sctp_addip_param_t 	ack_param;

	sctp_addip_param_t 	ack_param;

net/sctp/tsnmap.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -401,13 +401,14 @@ __u16 sctp_tsnmap_num_gabs(struct sctp_tsnmap *map) 




	/* Refresh the gap ack information. */

	/* Refresh the gap ack information. */

	if (sctp_tsnmap_has_gap(map)) {

	if (sctp_tsnmap_has_gap(map)) {

		__u16 start, end;

		sctp_tsnmap_iter_init(map, &iter);

		sctp_tsnmap_iter_init(map, &iter);

		while (sctp_tsnmap_next_gap_ack(map, &iter,

		while (sctp_tsnmap_next_gap_ack(map, &iter,

						&map->gabs[gabs].start,

						&start,

						&map->gabs[gabs].end)) {

						&end)) {





			map->gabs[gabs].start = htons(map->gabs[gabs].start);

			map->gabs[gabs].start = htons(start);

			map->gabs[gabs].end = htons(map->gabs[gabs].end);

			map->gabs[gabs].end = htons(end);

			gabs++;

			gabs++;

			if (gabs >= SCTP_MAX_GABS)

			if (gabs >= SCTP_MAX_GABS)

				break;

				break;

net/sctp/ulpevent.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -351,7 +351,7 @@ struct sctp_ulpevent *sctp_ulpevent_make_remote_error( 
	struct sctp_remote_error *sre;

	struct sctp_remote_error *sre;

	struct sk_buff *skb;

	struct sk_buff *skb;

	sctp_errhdr_t *ch;

	sctp_errhdr_t *ch;

	__u16 cause;

	__be16 cause;

	int elen;

	int elen;





	ch = (sctp_errhdr_t *)(chunk->skb->data);

	ch = (sctp_errhdr_t *)(chunk->skb->data);