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

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

sctp: remove the typedef sctp_shutdownhdr_t 



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

It is also to use sizeof(variable) instead of sizeof(type).

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

include/linux/sctp.h

+3 −3
Original line number Diff line number Diff line
@@ -416,13 +416,13 @@ struct sctp_abort_chunk { 
/* For the graceful shutdown we must carry the tag (in common header)

 * and the highest consecutive acking value.

 */

typedef struct sctp_shutdownhdr {

struct sctp_shutdownhdr {

	__be32 cum_tsn_ack;

} sctp_shutdownhdr_t;

};



struct sctp_shutdown_chunk_t {

	struct sctp_chunkhdr chunk_hdr;

	sctp_shutdownhdr_t shutdown_hdr;

	struct sctp_shutdownhdr shutdown_hdr;

};



/* RFC 2960.  Section 3.3.10 Operation Error (ERROR) (9) */

net/sctp/sm_make_chunk.c

+2 −2
Original line number Diff line number Diff line
@@ -857,15 +857,15 @@ struct sctp_chunk *sctp_make_sack(const struct sctp_association *asoc) 
struct sctp_chunk *sctp_make_shutdown(const struct sctp_association *asoc,

				      const struct sctp_chunk *chunk)

{

	struct sctp_shutdownhdr shut;

	struct sctp_chunk *retval;

	sctp_shutdownhdr_t shut;

	__u32 ctsn;



	ctsn = sctp_tsnmap_get_ctsn(&asoc->peer.tsn_map);

	shut.cum_tsn_ack = htonl(ctsn);



	retval = sctp_make_control(asoc, SCTP_CID_SHUTDOWN, 0,

				   sizeof(sctp_shutdownhdr_t), GFP_ATOMIC);

				   sizeof(shut), GFP_ATOMIC);

	if (!retval)

		goto nodata;

net/sctp/sm_statefuns.c

+5 −5
Original line number Diff line number Diff line
@@ -2656,8 +2656,8 @@ sctp_disposition_t sctp_sf_do_9_2_shutdown(struct net *net, 
					   sctp_cmd_seq_t *commands)

{

	struct sctp_chunk *chunk = arg;

	sctp_shutdownhdr_t *sdh;

	sctp_disposition_t disposition;

	struct sctp_shutdownhdr *sdh;

	struct sctp_ulpevent *ev;

	__u32 ctsn;
@@ -2671,8 +2671,8 @@ sctp_disposition_t sctp_sf_do_9_2_shutdown(struct net *net, 
						  commands);



	/* Convert the elaborate header.  */

	sdh = (sctp_shutdownhdr_t *)chunk->skb->data;

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

	sdh = (struct sctp_shutdownhdr *)chunk->skb->data;

	skb_pull(chunk->skb, sizeof(*sdh));

	chunk->subh.shutdown_hdr = sdh;

	ctsn = ntohl(sdh->cum_tsn_ack);
@@ -2746,7 +2746,7 @@ sctp_disposition_t sctp_sf_do_9_2_shut_ctsn(struct net *net, 
					   sctp_cmd_seq_t *commands)

{

	struct sctp_chunk *chunk = arg;

	sctp_shutdownhdr_t *sdh;

	struct sctp_shutdownhdr *sdh;

	__u32 ctsn;



	if (!sctp_vtag_verify(chunk, asoc))
@@ -2758,7 +2758,7 @@ sctp_disposition_t sctp_sf_do_9_2_shut_ctsn(struct net *net, 
		return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,

						  commands);



	sdh = (sctp_shutdownhdr_t *)chunk->skb->data;

	sdh = (struct sctp_shutdownhdr *)chunk->skb->data;

	ctsn = ntohl(sdh->cum_tsn_ack);



	if (TSN_lt(ctsn, asoc->ctsn_ack_point)) {