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

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

sctp: remove the typedef sctp_ecnehdr_t 



This patch is to remove the typedef sctp_ecnehdr_t, and
replace with struct sctp_ecnehdr 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 2a493216

include/linux/sctp.h

+3 −3
Original line number Diff line number Diff line
@@ -519,13 +519,13 @@ enum sctp_error { 
/* RFC 2960.  Appendix A.  Explicit Congestion Notification.

 *   Explicit Congestion Notification Echo (ECNE) (12)

 */

typedef struct sctp_ecnehdr {

struct sctp_ecnehdr {

	__be32 lowest_tsn;

} sctp_ecnehdr_t;

};



typedef struct sctp_ecne_chunk {

	struct sctp_chunkhdr chunk_hdr;

	sctp_ecnehdr_t ence_hdr;

	struct sctp_ecnehdr ence_hdr;

} sctp_ecne_chunk_t;



/* RFC 2960.  Appendix A.  Explicit Congestion Notification.

net/sctp/sm_make_chunk.c

+2 −2
Original line number Diff line number Diff line
@@ -697,11 +697,11 @@ struct sctp_chunk *sctp_make_ecne(const struct sctp_association *asoc, 
			     const __u32 lowest_tsn)

{

	struct sctp_chunk *retval;

	sctp_ecnehdr_t ecne;

	struct sctp_ecnehdr ecne;



	ecne.lowest_tsn = htonl(lowest_tsn);

	retval = sctp_make_control(asoc, SCTP_CID_ECN_ECNE, 0,

				   sizeof(sctp_ecnehdr_t), GFP_ATOMIC);

				   sizeof(ecne), GFP_ATOMIC);

	if (!retval)

		goto nodata;

	retval->subh.ecne_hdr =

net/sctp/sm_statefuns.c

+3 −3
Original line number Diff line number Diff line
@@ -2918,8 +2918,8 @@ sctp_disposition_t sctp_sf_do_ecne(struct net *net, 
				   void *arg,

				   sctp_cmd_seq_t *commands)

{

	sctp_ecnehdr_t *ecne;

	struct sctp_chunk *chunk = arg;

	struct sctp_ecnehdr *ecne;



	if (!sctp_vtag_verify(chunk, asoc))

		return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
@@ -2928,8 +2928,8 @@ sctp_disposition_t sctp_sf_do_ecne(struct net *net, 
		return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,

						  commands);



	ecne = (sctp_ecnehdr_t *) chunk->skb->data;

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

	ecne = (struct sctp_ecnehdr *)chunk->skb->data;

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



	/* If this is a newer ECNE than the last CWR packet we sent out */

	sctp_add_cmd_sf(commands, SCTP_CMD_ECN_ECNE,