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

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

sctp: remove the typedef sctp_abort_chunk_t 



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

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

include/linux/sctp.h

+2 −2
Original line number Diff line number Diff line
@@ -408,9 +408,9 @@ struct sctp_heartbeat_chunk { 
 * common header. Just the common header is all that is needed with a

 * chunk descriptor.

 */

typedef struct sctp_abort_chunk {

struct sctp_abort_chunk {

	struct sctp_chunkhdr uh;

} sctp_abort_chunk_t;

};





/* For the graceful shutdown we must carry the tag (in common header)

net/sctp/sm_statefuns.c

+4 −4
Original line number Diff line number Diff line
@@ -2164,7 +2164,7 @@ sctp_disposition_t sctp_sf_shutdown_pending_abort( 
	 * as we do not know its true length.  So, to be safe, discard the

	 * packet.

	 */

	if (!sctp_chunk_length_valid(chunk, sizeof(sctp_abort_chunk_t)))

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

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



	/* ADD-IP: Special case for ABORT chunks
@@ -2206,7 +2206,7 @@ sctp_disposition_t sctp_sf_shutdown_sent_abort(struct net *net, 
	 * as we do not know its true length.  So, to be safe, discard the

	 * packet.

	 */

	if (!sctp_chunk_length_valid(chunk, sizeof(sctp_abort_chunk_t)))

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

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



	/* ADD-IP: Special case for ABORT chunks
@@ -2470,7 +2470,7 @@ sctp_disposition_t sctp_sf_do_9_1_abort(struct net *net, 
	 * as we do not know its true length.  So, to be safe, discard the

	 * packet.

	 */

	if (!sctp_chunk_length_valid(chunk, sizeof(sctp_abort_chunk_t)))

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

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



	/* ADD-IP: Special case for ABORT chunks
@@ -2546,7 +2546,7 @@ sctp_disposition_t sctp_sf_cookie_wait_abort(struct net *net, 
	 * as we do not know its true length.  So, to be safe, discard the

	 * packet.

	 */

	if (!sctp_chunk_length_valid(chunk, sizeof(sctp_abort_chunk_t)))

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

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



	/* See if we have an error cause code in the chunk.  */