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

Commit 34bcca28 authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[SCTP]: Even 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 2178eda8

net/sctp/outqueue.c

+1 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,7 @@ int sctp_outq_sack(struct sctp_outq *q, struct sctp_sackhdr *sack) 
	 * A) Initialize the cacc_saw_newack to 0 for all destination

	 * addresses.

	 */

	if (sack->num_gap_ack_blocks > 0 &&

	if (sack->num_gap_ack_blocks &&

	    primary->cacc.changeover_active) {

		list_for_each(pos, transport_list) {

			transport = list_entry(pos, struct sctp_transport,

net/sctp/sm_make_chunk.c

+2 −2
Original line number Diff line number Diff line
@@ -1472,10 +1472,10 @@ struct sctp_association *sctp_unpack_cookie( 
			suseconds_t usecs = (tv.tv_sec -

				bear_cookie->expiration.tv_sec) * 1000000L +

				tv.tv_usec - bear_cookie->expiration.tv_usec;

			__be32 n = htonl(usecs);



			usecs = htonl(usecs);

			sctp_init_cause(*errp, SCTP_ERROR_STALE_COOKIE,

					&usecs, sizeof(usecs));

					&n, sizeof(n));

			*error = -SCTP_IERROR_STALE_COOKIE;

		} else

			*error = -SCTP_IERROR_NOMEM;

net/sctp/sm_statefuns.c

+5 −4
Original line number Diff line number Diff line
@@ -2158,7 +2158,7 @@ static sctp_disposition_t sctp_sf_do_5_2_6_stale(const struct sctp_endpoint *ep, 
	 * to give ample time to retransmit the new cookie and thus

	 * yield a higher probability of success on the reattempt.

	 */

	stale = ntohl(*(suseconds_t *)((u8 *)err + sizeof(sctp_errhdr_t)));

	stale = ntohl(*(__be32 *)((u8 *)err + sizeof(sctp_errhdr_t)));

	stale = (stale * 2) / 1000;



	bht.param_hdr.type = SCTP_PARAM_COOKIE_PRESERVATIVE;
@@ -2545,6 +2545,7 @@ sctp_disposition_t sctp_sf_do_ecn_cwr(const struct sctp_endpoint *ep, 
{

	sctp_cwrhdr_t *cwr;

	struct sctp_chunk *chunk = arg;

	u32 lowest_tsn;



	if (!sctp_vtag_verify(chunk, asoc))

		return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
@@ -2556,14 +2557,14 @@ sctp_disposition_t sctp_sf_do_ecn_cwr(const struct sctp_endpoint *ep, 
	cwr = (sctp_cwrhdr_t *) chunk->skb->data;

	skb_pull(chunk->skb, sizeof(sctp_cwrhdr_t));



	cwr->lowest_tsn = ntohl(cwr->lowest_tsn);

	lowest_tsn = ntohl(cwr->lowest_tsn);



	/* Does this CWR ack the last sent congestion notification? */

	if (TSN_lte(asoc->last_ecne_tsn, cwr->lowest_tsn)) {

	if (TSN_lte(asoc->last_ecne_tsn, lowest_tsn)) {

		/* Stop sending ECNE. */

		sctp_add_cmd_sf(commands,

				SCTP_CMD_ECN_CWR,

				SCTP_U32(cwr->lowest_tsn));

				SCTP_U32(lowest_tsn));

	}

	return SCTP_DISPOSITION_CONSUME;

}