Browse Source

sctp: remove the typedef sctp_sackhdr_t

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

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Xin Long 8 years ago
parent
commit
787310859d
3 changed files with 6 additions and 6 deletions
  1. 3 3
      include/linux/sctp.h
  2. 2 2
      include/net/sctp/command.h
  3. 1 1
      net/sctp/sm_statefuns.c

+ 3 - 3
include/linux/sctp.h

@@ -373,17 +373,17 @@ union sctp_sack_variable {
 	__be32 dup;
 	__be32 dup;
 };
 };
 
 
-typedef struct sctp_sackhdr {
+struct sctp_sackhdr {
 	__be32 cum_tsn_ack;
 	__be32 cum_tsn_ack;
 	__be32 a_rwnd;
 	__be32 a_rwnd;
 	__be16 num_gap_ack_blocks;
 	__be16 num_gap_ack_blocks;
 	__be16 num_dup_tsns;
 	__be16 num_dup_tsns;
 	union sctp_sack_variable variable[0];
 	union sctp_sack_variable variable[0];
-} sctp_sackhdr_t;
+};
 
 
 typedef struct sctp_sack_chunk {
 typedef struct sctp_sack_chunk {
 	struct sctp_chunkhdr chunk_hdr;
 	struct sctp_chunkhdr chunk_hdr;
-	sctp_sackhdr_t sack_hdr;
+	struct sctp_sackhdr sack_hdr;
 } sctp_sack_chunk_t;
 } sctp_sack_chunk_t;
 
 
 
 

+ 2 - 2
include/net/sctp/command.h

@@ -135,7 +135,7 @@ typedef union {
 	struct sctp_init_chunk *init;
 	struct sctp_init_chunk *init;
 	struct sctp_ulpevent *ulpevent;
 	struct sctp_ulpevent *ulpevent;
 	struct sctp_packet *packet;
 	struct sctp_packet *packet;
-	sctp_sackhdr_t *sackh;
+	struct sctp_sackhdr *sackh;
 	struct sctp_datamsg *msg;
 	struct sctp_datamsg *msg;
 } sctp_arg_t;
 } sctp_arg_t;
 
 
@@ -176,7 +176,7 @@ SCTP_ARG_CONSTRUCTOR(BA,	struct sctp_bind_addr *, bp)
 SCTP_ARG_CONSTRUCTOR(PEER_INIT,	struct sctp_init_chunk *, init)
 SCTP_ARG_CONSTRUCTOR(PEER_INIT,	struct sctp_init_chunk *, init)
 SCTP_ARG_CONSTRUCTOR(ULPEVENT,  struct sctp_ulpevent *, ulpevent)
 SCTP_ARG_CONSTRUCTOR(ULPEVENT,  struct sctp_ulpevent *, ulpevent)
 SCTP_ARG_CONSTRUCTOR(PACKET,	struct sctp_packet *, packet)
 SCTP_ARG_CONSTRUCTOR(PACKET,	struct sctp_packet *, packet)
-SCTP_ARG_CONSTRUCTOR(SACKH,	sctp_sackhdr_t *, sackh)
+SCTP_ARG_CONSTRUCTOR(SACKH,	struct sctp_sackhdr *, sackh)
 SCTP_ARG_CONSTRUCTOR(DATAMSG,	struct sctp_datamsg *, msg)
 SCTP_ARG_CONSTRUCTOR(DATAMSG,	struct sctp_datamsg *, msg)
 
 
 static inline sctp_arg_t SCTP_FORCE(void)
 static inline sctp_arg_t SCTP_FORCE(void)

+ 1 - 1
net/sctp/sm_statefuns.c

@@ -3187,7 +3187,7 @@ sctp_disposition_t sctp_sf_eat_sack_6_2(struct net *net,
 					sctp_cmd_seq_t *commands)
 					sctp_cmd_seq_t *commands)
 {
 {
 	struct sctp_chunk *chunk = arg;
 	struct sctp_chunk *chunk = arg;
-	sctp_sackhdr_t *sackh;
+	struct sctp_sackhdr *sackh;
 	__u32 ctsn;
 	__u32 ctsn;
 
 
 	if (!sctp_vtag_verify(chunk, asoc))
 	if (!sctp_vtag_verify(chunk, asoc))