1 files changed, 7 insertions, 8 deletions

diff --git a/net/sctp/inqueue.c b/net/sctp/inqueue.c
index f731de3e8428..48392552ee7c 100644
--- a/net/sctp/inqueue.c
+++ b/net/sctp/inqueue.c
@@ -99,7 +99,7 @@ void sctp_inq_push(struct sctp_inq *q, struct sctp_chunk *chunk)
 struct sctp_chunkhdr *sctp_inq_peek(struct sctp_inq *queue)
 {
         struct sctp_chunk *chunk;
-        sctp_chunkhdr_t *ch = NULL;
+        struct sctp_chunkhdr *ch = NULL;
 
         chunk = queue->in_progress;
         /* If there is no more chunks in this packet, say so */
@@ -108,7 +108,7 @@ struct sctp_chunkhdr *sctp_inq_peek(struct sctp_inq *queue)
             chunk->pdiscard)
                     return NULL;
 
-        ch = (sctp_chunkhdr_t *)chunk->chunk_end;
+        ch = (struct sctp_chunkhdr *)chunk->chunk_end;
 
         return ch;
 }
@@ -122,7 +122,7 @@ struct sctp_chunkhdr *sctp_inq_peek(struct sctp_inq *queue)
 struct sctp_chunk *sctp_inq_pop(struct sctp_inq *queue)
 {
         struct sctp_chunk *chunk;
-        sctp_chunkhdr_t *ch = NULL;
+        struct sctp_chunkhdr *ch = NULL;
 
         /* The assumption is that we are safe to process the chunks
          * at this time.
@@ -151,7 +151,7 @@ struct sctp_chunk *sctp_inq_pop(struct sctp_inq *queue)
                         chunk = queue->in_progress = NULL;
                 } else {
                         /* Nothing to do. Next chunk in the packet, please. */
-                        ch = (sctp_chunkhdr_t *) chunk->chunk_end;
+                        ch = (struct sctp_chunkhdr *)chunk->chunk_end;
                         /* Force chunk->skb->data to chunk->chunk_end.  */
                         skb_pull(chunk->skb, chunk->chunk_end - chunk->skb->data);
                         /* We are guaranteed to pull a SCTP header. */
@@ -195,7 +195,7 @@ next_chunk:
 
 new_skb:
                 /* This is the first chunk in the packet.  */
-                ch = (sctp_chunkhdr_t *) chunk->skb->data;
+                ch = (struct sctp_chunkhdr *)chunk->skb->data;
                 chunk->singleton = 1;
                 chunk->data_accepted = 0;
                 chunk->pdiscard = 0;
@@ -214,11 +214,10 @@ new_skb:
 
         chunk->chunk_hdr = ch;
         chunk->chunk_end = ((__u8 *)ch) + SCTP_PAD4(ntohs(ch->length));
-        skb_pull(chunk->skb, sizeof(sctp_chunkhdr_t));
+        skb_pull(chunk->skb, sizeof(*ch));
         chunk->subh.v = NULL; /* Subheader is no longer valid.  */
 
-        if (chunk->chunk_end + sizeof(sctp_chunkhdr_t) <
-            skb_tail_pointer(chunk->skb)) {
+        if (chunk->chunk_end + sizeof(*ch) < skb_tail_pointer(chunk->skb)) {
                 /* This is not a singleton */
                 chunk->singleton = 0;
         } else if (chunk->chunk_end > skb_tail_pointer(chunk->skb)) {