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

Commit ac23e681 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: fix the name of struct sctp_shutdown_chunk_t 



This patch is to fix the name of struct sctp_shutdown_chunk_t
, replace with struct sctp_initack_chunk in the places where
it's using it.

It is also to fix some indent problem.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e61e4055

include/linux/sctp.h

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ struct sctp_shutdownhdr { 
	__be32 cum_tsn_ack;

};



struct sctp_shutdown_chunk_t {

struct sctp_shutdown_chunk {

	struct sctp_chunkhdr chunk_hdr;

	struct sctp_shutdownhdr shutdown_hdr;

};

net/sctp/sm_statefuns.c

+8 −8
Original line number Diff line number Diff line
@@ -2665,8 +2665,7 @@ sctp_disposition_t sctp_sf_do_9_2_shutdown(struct net *net, 
		return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);



	/* Make sure that the SHUTDOWN chunk has a valid length. */

	if (!sctp_chunk_length_valid(chunk,

				      sizeof(struct sctp_shutdown_chunk_t)))

	if (!sctp_chunk_length_valid(chunk, sizeof(struct sctp_shutdown_chunk)))

		return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,

						  commands);
@@ -2753,8 +2752,7 @@ sctp_disposition_t sctp_sf_do_9_2_shut_ctsn(struct net *net, 
		return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);



	/* Make sure that the SHUTDOWN chunk has a valid length. */

	if (!sctp_chunk_length_valid(chunk,

				      sizeof(struct sctp_shutdown_chunk_t)))

	if (!sctp_chunk_length_valid(chunk, sizeof(struct sctp_shutdown_chunk)))

		return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,

						  commands);
@@ -5419,12 +5417,14 @@ sctp_disposition_t sctp_sf_do_9_2_shutdown_ack( 
	 */

	if (chunk) {

		if (!sctp_vtag_verify(chunk, asoc))

			return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);

			return sctp_sf_pdiscard(net, ep, asoc, type, arg,

						commands);



		/* Make sure that the SHUTDOWN chunk has a valid length. */

		if (!sctp_chunk_length_valid(chunk, sizeof(struct sctp_shutdown_chunk_t)))

			return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,

							  commands);

		if (!sctp_chunk_length_valid(

				chunk, sizeof(struct sctp_shutdown_chunk)))

			return sctp_sf_violation_chunklen(net, ep, asoc, type,

							  arg, commands);

	}



	/* If it has no more outstanding DATA chunks, the SHUTDOWN receiver