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

Commit 47b3ba51 authored by Marcelo Ricardo Leitner's avatar Marcelo Ricardo Leitner Committed by David S. Miller
Browse files

sctp: fix const parameter violation in sctp_make_sack 



sctp_make_sack() make changes to the asoc and this cast is just
bypassing the const attribute. As there is no need to have the const
there, just remove it and fix the violation.

Signed-off-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Reviewed-by: default avatarXin Long <lucien.xin@gmail.com>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ce33e46

include/net/sctp/sm.h

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ struct sctp_chunk *sctp_make_datafrag_empty(const struct sctp_association *asoc, 
					    int len, __u8 flags, gfp_t gfp);

struct sctp_chunk *sctp_make_ecne(const struct sctp_association *asoc,

				  const __u32 lowest_tsn);

struct sctp_chunk *sctp_make_sack(const struct sctp_association *asoc);

struct sctp_chunk *sctp_make_sack(struct sctp_association *asoc);

struct sctp_chunk *sctp_make_shutdown(const struct sctp_association *asoc,

				      const struct sctp_chunk *chunk);

struct sctp_chunk *sctp_make_shutdown_ack(const struct sctp_association *asoc,

net/sctp/sm_make_chunk.c

+4 −5
Original line number Diff line number Diff line
@@ -779,10 +779,9 @@ struct sctp_chunk *sctp_make_datafrag_empty(const struct sctp_association *asoc, 
 * association.  This reports on which TSN's we've seen to date,

 * including duplicates and gaps.

 */

struct sctp_chunk *sctp_make_sack(const struct sctp_association *asoc)

struct sctp_chunk *sctp_make_sack(struct sctp_association *asoc)

{

	struct sctp_tsnmap *map = (struct sctp_tsnmap *)&asoc->peer.tsn_map;

	struct sctp_association *aptr = (struct sctp_association *)asoc;

	struct sctp_gap_ack_block gabs[SCTP_MAX_GABS];

	__u16 num_gabs, num_dup_tsns;

	struct sctp_transport *trans;
@@ -857,7 +856,7 @@ struct sctp_chunk *sctp_make_sack(const struct sctp_association *asoc) 


	/* Add the duplicate TSN information.  */

	if (num_dup_tsns) {

		aptr->stats.idupchunks += num_dup_tsns;

		asoc->stats.idupchunks += num_dup_tsns;

		sctp_addto_chunk(retval, sizeof(__u32) * num_dup_tsns,

				 sctp_tsnmap_get_dups(map));

	}
@@ -869,11 +868,11 @@ struct sctp_chunk *sctp_make_sack(const struct sctp_association *asoc) 
	 * association so no transport will match after a wrap event like this,

	 * Until the next sack

	 */

	if (++aptr->peer.sack_generation == 0) {

	if (++asoc->peer.sack_generation == 0) {

		list_for_each_entry(trans, &asoc->peer.transport_addr_list,

				    transports)

			trans->sack_generation = 0;

		aptr->peer.sack_generation = 1;

		asoc->peer.sack_generation = 1;

	}

nodata:

	return retval;