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: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 6 insertions, 6 deletions

diff --git a/net/sctp/output.c b/net/sctp/output.c
index 9bf9d84a96b7..9d8504985744 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -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;
 
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 1ba9a9b04466..212fe7614d08 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -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;
 
diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c
index 25f7e4140566..0225d62a869f 100644
--- a/net/sctp/ulpqueue.c
+++ b/net/sctp/ulpqueue.c
@@ -1090,7 +1090,7 @@ void sctp_ulpq_renege(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk,
 
         if (chunk) {
                 needed = ntohs(chunk->chunk_hdr->length);
-                needed -= sizeof(sctp_data_chunk_t);
+                needed -= sizeof(struct sctp_data_chunk);
         } else
                 needed = SCTP_DEFAULT_MAXWINDOW;