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

Commit d4d6c614 authored Jul 23, 2017 by Xin Long Committed by David S. Miller Jul 24, 2017

sctp: remove the typedef sctp_sack_chunk_t



This patch is to remove the typedef sctp_sack_chunk_t, and
replace with struct sctp_sack_chunk in the places where it's
using this typedef.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 78731085

include/linux/sctp.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -381,10 +381,10 @@ struct sctp_sackhdr {
		union sctp_sack_variable variable[0];
		};

		typedef struct sctp_sack_chunk {
		struct sctp_sack_chunk {
		struct sctp_chunkhdr chunk_hdr;
		struct sctp_sackhdr sack_hdr;
		} sctp_sack_chunk_t;
		};


		/* RFC 2960. Section 3.3.5 Heartbeat Request (HEARTBEAT) (4):

net/sctp/chunk.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -221,7 +221,7 @@ struct sctp_datamsg sctp_datamsg_from_user(struct sctp_association asoc,
		asoc->outqueue.out_qlen == 0 &&
		list_empty(&asoc->outqueue.retransmit) &&
		msg_len > max_data)
		first_len -= SCTP_PAD4(sizeof(sctp_sack_chunk_t));
		first_len -= SCTP_PAD4(sizeof(struct sctp_sack_chunk));

		/* Encourage Cookie-ECHO bundling. */
		if (asoc->state < SCTP_STATE_COOKIE_ECHOED)

net/sctp/sm_statefuns.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3194,7 +3194,7 @@ sctp_disposition_t sctp_sf_eat_sack_6_2(struct net *net,
		return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);

		/* Make sure that the SACK chunk has a valid length. */
		if (!sctp_chunk_length_valid(chunk, sizeof(sctp_sack_chunk_t)))
		if (!sctp_chunk_length_valid(chunk, sizeof(struct sctp_sack_chunk)))
		return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,
		commands);

		@@ -4515,7 +4515,7 @@ static sctp_disposition_t sctp_sf_abort_violation(
		* Handle a protocol violation when the chunk length is invalid.
		* "Invalid" length is identified as smaller than the minimal length a
		* given chunk can be. For example, a SACK chunk has invalid length
		* if its length is set to be smaller than the size of sctp_sack_chunk_t.
		* if its length is set to be smaller than the size of struct sctp_sack_chunk.
		*
		* We inform the other end by sending an ABORT with a Protocol Violation
		* error code.