sctp: remove the typedef sctp_cwrhdr_t

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

It is also to use sizeof(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 026bbdfcaf44a432a79793abb99633f4863bcb16..3c8c418425e67835068e5d54069dbbe16b99d23d 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -531,13 +531,13 @@ struct sctp_ecne_chunk {
 /* RFC 2960.  Appendix A.  Explicit Congestion Notification.
  *   Congestion Window Reduced (CWR) (13)
  */
-typedef struct sctp_cwrhdr {
+struct sctp_cwrhdr {
        __be32 lowest_tsn;
-} sctp_cwrhdr_t;
+};
 
 typedef struct sctp_cwr_chunk {
        struct sctp_chunkhdr chunk_hdr;
-       sctp_cwrhdr_t cwr_hdr;
+       struct sctp_cwrhdr cwr_hdr;
 } sctp_cwr_chunk_t;
 
 /* PR-SCTP

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 1c7cc6a48bde6a2c2fdaf12d07207b0c7ada863c..e8e506522193f928a3577ecf872c9d3b386ee2f8 100644 (file)
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -663,11 +663,11 @@ struct sctp_chunk *sctp_make_cwr(const struct sctp_association *asoc,
                            const struct sctp_chunk *chunk)
 {
        struct sctp_chunk *retval;
-       sctp_cwrhdr_t cwr;
+       struct sctp_cwrhdr cwr;
 
        cwr.lowest_tsn = htonl(lowest_tsn);
        retval = sctp_make_control(asoc, SCTP_CID_ECN_CWR, 0,
-                                  sizeof(sctp_cwrhdr_t), GFP_ATOMIC);
+                                  sizeof(cwr), GFP_ATOMIC);
 
        if (!retval)
                goto nodata;

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 286dce14c5ccffd8f6eadce0d5944d67255120c8..e13c83f9a6eea8efbfb185fcaf668d418abae5b0 100644 (file)
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -2862,8 +2862,8 @@ sctp_disposition_t sctp_sf_do_ecn_cwr(struct net *net,
                                      void *arg,
                                      sctp_cmd_seq_t *commands)
 {
-       sctp_cwrhdr_t *cwr;
        struct sctp_chunk *chunk = arg;
+       struct sctp_cwrhdr *cwr;
        u32 lowest_tsn;
 
        if (!sctp_vtag_verify(chunk, asoc))
@@ -2873,8 +2873,8 @@ sctp_disposition_t sctp_sf_do_ecn_cwr(struct net *net,
                return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,
                                                  commands);
 
-       cwr = (sctp_cwrhdr_t *) chunk->skb->data;
-       skb_pull(chunk->skb, sizeof(sctp_cwrhdr_t));
+       cwr = (struct sctp_cwrhdr *)chunk->skb->data;
+       skb_pull(chunk->skb, sizeof(*cwr));
 
        lowest_tsn = ntohl(cwr->lowest_tsn);