sctp: remove the typedef sctp_datahdr_t

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

It is also to use izeof(variable) instead of sizeof(type).

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

diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index d5c0ddadb68b1df8cc201790a81a0b1e2de7475a..55d84c14312222bf6940e0d0e171720637293b3c 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -227,17 +227,17 @@ enum { SCTP_PARAM_ACTION_MASK = cpu_to_be16(0xc000), };
 
 /* RFC 2960 Section 3.3.1 Payload Data (DATA) (0) */
 
-typedef struct sctp_datahdr {
+struct sctp_datahdr {
        __be32 tsn;
        __be16 stream;
        __be16 ssn;
        __be32 ppid;
        __u8  payload[0];
-} sctp_datahdr_t;
+};
 
 typedef struct sctp_data_chunk {
        struct sctp_chunkhdr chunk_hdr;
-       sctp_datahdr_t  data_hdr;
+       struct sctp_datahdr data_hdr;
 } sctp_data_chunk_t;
 
 /* DATA Chuck Specific Flags */

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 0a01c6858b0d3e1a808df3d881f0845b41443b41..1ba9a9b044660bef86c6214525be24791ed7f35d 100644 (file)
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -3010,7 +3010,8 @@ sctp_disposition_t sctp_sf_eat_data_6_2(struct net *net,
                return SCTP_DISPOSITION_ABORT;
        case SCTP_IERROR_PROTO_VIOLATION:
                return sctp_sf_abort_violation(net, ep, asoc, chunk, commands,
-                       (u8 *)chunk->subh.data_hdr, sizeof(sctp_datahdr_t));
+                                              (u8 *)chunk->subh.data_hdr,
+                                              sizeof(struct sctp_datahdr));
        default:
                BUG();
        }
@@ -3124,7 +3125,8 @@ sctp_disposition_t sctp_sf_eat_data_fast_4_4(struct net *net,
                return SCTP_DISPOSITION_ABORT;
        case SCTP_IERROR_PROTO_VIOLATION:
                return sctp_sf_abort_violation(net, ep, asoc, chunk, commands,
-                       (u8 *)chunk->subh.data_hdr, sizeof(sctp_datahdr_t));
+                                              (u8 *)chunk->subh.data_hdr,
+                                              sizeof(struct sctp_datahdr));
        default:
                BUG();
        }
@@ -6197,7 +6199,7 @@ static int sctp_eat_data(const struct sctp_association *asoc,
                         struct sctp_chunk *chunk,
                         sctp_cmd_seq_t *commands)
 {
-       sctp_datahdr_t *data_hdr;
+       struct sctp_datahdr *data_hdr;
        struct sctp_chunk *err;
        size_t datalen;
        sctp_verb_t deliver;
@@ -6210,8 +6212,9 @@ static int sctp_eat_data(const struct sctp_association *asoc,
        u16 sid;
        u8 ordered = 0;
 
-       data_hdr = chunk->subh.data_hdr = (sctp_datahdr_t *)chunk->skb->data;
-       skb_pull(chunk->skb, sizeof(sctp_datahdr_t));
+       data_hdr = (struct sctp_datahdr *)chunk->skb->data;
+       chunk->subh.data_hdr = data_hdr;
+       skb_pull(chunk->skb, sizeof(*data_hdr));
 
        tsn = ntohl(data_hdr->tsn);
        pr_debug("%s: TSN 0x%x\n", __func__, tsn);