sctp: remove the typedef sctp_authhdr_t

This patch is to remove the typedef sctp_authhdr_t, and
replace with struct sctp_authhdr 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 e7b439e..b7603f5 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -693,15 +693,15 @@ struct sctp_addip_chunk {
  *   HMAC: n bytes (unsigned integer) This hold the result of the HMAC
  *      calculation.
  */
-typedef struct sctp_authhdr {
+struct sctp_authhdr {
        __be16 shkey_id;
        __be16 hmac_id;
        __u8   hmac[0];
-} sctp_authhdr_t;
+};
 
 typedef struct sctp_auth_chunk {
        struct sctp_chunkhdr chunk_hdr;
-       sctp_authhdr_t auth_hdr;
+       struct sctp_authhdr auth_hdr;
 } sctp_auth_chunk_t;
 
 struct sctp_infox {

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index ae54c6e..d17e8d1 100644 (file)
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -1282,16 +1282,16 @@ struct sctp_chunk *sctp_make_auth(const struct sctp_association *asoc)
                return NULL;
 
        retval = sctp_make_control(asoc, SCTP_CID_AUTH, 0,
-                       hmac_desc->hmac_len + sizeof(sctp_authhdr_t),
-                       GFP_ATOMIC);
+                                  hmac_desc->hmac_len + sizeof(auth_hdr),
+                                  GFP_ATOMIC);
        if (!retval)
                return NULL;
 
        auth_hdr.hmac_id = htons(hmac_desc->hmac_id);
        auth_hdr.shkey_id = htons(asoc->active_key_id);
 
-       retval->subh.auth_hdr = sctp_addto_chunk(retval, sizeof(sctp_authhdr_t),
-                                               &auth_hdr);
+       retval->subh.auth_hdr = sctp_addto_chunk(retval, sizeof(auth_hdr),
+                                                &auth_hdr);
 
        hmac = skb_put_zero(retval->skb, hmac_desc->hmac_len);