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

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

sctp: remove the typedef sctp_sack_variable_t 



This patch is to remove the typedef sctp_sack_variable_t, and
replace with union sctp_sack_variable in the places where it's
using this typedef.

It is also to fix some indents in sctp_acked().

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

include/linux/sctp.h

+3 −3
Original line number Diff line number Diff line
@@ -368,17 +368,17 @@ struct sctp_gap_ack_block { 
	__be16 end;

};



typedef union {

union sctp_sack_variable {

	struct sctp_gap_ack_block gab;

	__be32 dup;

} sctp_sack_variable_t;

};



typedef struct sctp_sackhdr {

	__be32 cum_tsn_ack;

	__be32 a_rwnd;

	__be16 num_gap_ack_blocks;

	__be16 num_dup_tsns;

	sctp_sack_variable_t variable[0];

	union sctp_sack_variable variable[0];

} sctp_sackhdr_t;



typedef struct sctp_sack_chunk {

net/sctp/outqueue.c

+5 −5
Original line number Diff line number Diff line
@@ -1197,7 +1197,7 @@ static void sctp_outq_flush(struct sctp_outq *q, int rtx_timeout, gfp_t gfp) 
static void sctp_sack_update_unack_data(struct sctp_association *assoc,

					struct sctp_sackhdr *sack)

{

	sctp_sack_variable_t *frags;

	union sctp_sack_variable *frags;

	__u16 unack_data;

	int i;
@@ -1224,7 +1224,7 @@ int sctp_outq_sack(struct sctp_outq *q, struct sctp_chunk *chunk) 
	struct sctp_transport *transport;

	struct sctp_chunk *tchunk = NULL;

	struct list_head *lchunk, *transport_list, *temp;

	sctp_sack_variable_t *frags = sack->variable;

	union sctp_sack_variable *frags = sack->variable;

	__u32 sack_ctsn, ctsn, tsn;

	__u32 highest_tsn, highest_new_tsn;

	__u32 sack_a_rwnd;
@@ -1736,10 +1736,10 @@ static void sctp_mark_missing(struct sctp_outq *q, 
/* Is the given TSN acked by this packet?  */

static int sctp_acked(struct sctp_sackhdr *sack, __u32 tsn)

{

	int i;

	sctp_sack_variable_t *frags;

	__u16 tsn_offset, blocks;

	__u32 ctsn = ntohl(sack->cum_tsn_ack);

	union sctp_sack_variable *frags;

	__u16 tsn_offset, blocks;

	int i;



	if (TSN_lte(tsn, ctsn))

		goto pass;