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

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

sctp: remove the typedef sctp_data_chunk_t 



This patch is to remove the typedef sctp_data_chunk_t, and replace
with struct sctp_data_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 3583df1a

include/linux/sctp.h

+2 −2
Original line number Diff line number Diff line
@@ -235,10 +235,10 @@ struct sctp_datahdr { 
	__u8  payload[0];

};



typedef struct sctp_data_chunk {

struct sctp_data_chunk {

	struct sctp_chunkhdr chunk_hdr;

	struct sctp_datahdr data_hdr;

} sctp_data_chunk_t;

};



/* DATA Chuck Specific Flags */

enum {

include/net/sctp/constants.h

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ SCTP_SUBTYPE_CONSTRUCTOR(PRIMITIVE, sctp_event_primitive_t, primitive) 
/* Calculate the actual data size in a data chunk */

#define SCTP_DATA_SNDSIZE(c) ((int)((unsigned long)(c->chunk_end)\

		       		- (unsigned long)(c->chunk_hdr)\

				- sizeof(sctp_data_chunk_t)))

				- sizeof(struct sctp_data_chunk)))



/* Internal error codes */

typedef enum {

include/net/sctp/sm.h

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static inline __u16 sctp_data_size(struct sctp_chunk *chunk) 
	__u16 size;



	size = ntohs(chunk->chunk_hdr->length);

	size -= sizeof(sctp_data_chunk_t);

	size -= sizeof(struct sctp_data_chunk);



	return size;

}

net/sctp/output.c

+2 −2
Original line number Diff line number Diff line
@@ -723,8 +723,8 @@ static sctp_xmit_t sctp_packet_can_append_data(struct sctp_packet *packet, 
	/* Check whether this chunk and all the rest of pending data will fit

	 * or delay in hopes of bundling a full sized packet.

	 */

	if (chunk->skb->len + q->out_qlen >

		transport->pathmtu - packet->overhead - sizeof(sctp_data_chunk_t) - 4)

	if (chunk->skb->len + q->out_qlen > transport->pathmtu -

		packet->overhead - sizeof(struct sctp_data_chunk) - 4)

		/* Enough data queued to fill a packet */

		return SCTP_XMIT_OK;

net/sctp/sm_statefuns.c

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

	}



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

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

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

						  commands);
@@ -3109,7 +3109,7 @@ sctp_disposition_t sctp_sf_eat_data_fast_4_4(struct net *net, 
		return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);

	}



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

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

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

						  commands);
@@ -6262,7 +6262,7 @@ static int sctp_eat_data(const struct sctp_association *asoc, 
	 * Actually, allow a little bit of overflow (up to a MTU).

	 */

	datalen = ntohs(chunk->chunk_hdr->length);

	datalen -= sizeof(sctp_data_chunk_t);

	datalen -= sizeof(struct sctp_data_chunk);



	deliver = SCTP_CMD_CHUNK_ULP;