sctp: remove the typedef sctp_unrecognized_param_t

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

It is also to fix some indents in sctp_sf_do_unexpected_init() and
sctp_sf_do_5_1B_init().

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 9e77abda2111d697f55cbef3fbca97060aee56b8..c323b3e3ecdbe13fd71c91de7646c21bbfc6975d 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -348,10 +348,10 @@ struct sctp_cookie_param {
 };
 
 /* Section 3.3.3.1 Unrecognized Parameters (8) */
-typedef struct sctp_unrecognized_param {
+struct sctp_unrecognized_param {
        struct sctp_paramhdr param_hdr;
        struct sctp_paramhdr unrecognized;
-} sctp_unrecognized_param_t;
+};
 
 
 

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 6568fc39590159bb79d0f2888df9475dee1451e4..7f852392f56a980e93f92c9e6309963d8d08f924 100644 (file)
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -306,12 +306,10 @@ sctp_disposition_t sctp_sf_do_5_1B_init(struct net *net,
                                        void *arg,
                                        sctp_cmd_seq_t *commands)
 {
-       struct sctp_chunk *chunk = arg;
-       struct sctp_chunk *repl;
+       struct sctp_chunk *chunk = arg, *repl, *err_chunk;
+       struct sctp_unrecognized_param *unk_param;
        struct sctp_association *new_asoc;
-       struct sctp_chunk *err_chunk;
        struct sctp_packet *packet;
-       sctp_unrecognized_param_t *unk_param;
        int len;
 
        /* 6.10 Bundling
@@ -435,7 +433,7 @@ sctp_disposition_t sctp_sf_do_5_1B_init(struct net *net,
                 * construct the parameters in INIT ACK by copying the
                 * ERROR causes over.
                 */
-               unk_param = (sctp_unrecognized_param_t *)
+               unk_param = (struct sctp_unrecognized_param *)
                            ((__u8 *)(err_chunk->chunk_hdr) +
                            sizeof(struct sctp_chunkhdr));
                /* Replace the cause code with the "Unrecognized parameter"
@@ -1419,13 +1417,11 @@ static sctp_disposition_t sctp_sf_do_unexpected_init(
        const sctp_subtype_t type,
        void *arg, sctp_cmd_seq_t *commands)
 {
-       sctp_disposition_t retval;
-       struct sctp_chunk *chunk = arg;
-       struct sctp_chunk *repl;
+       struct sctp_chunk *chunk = arg, *repl, *err_chunk;
+       struct sctp_unrecognized_param *unk_param;
        struct sctp_association *new_asoc;
-       struct sctp_chunk *err_chunk;
        struct sctp_packet *packet;
-       sctp_unrecognized_param_t *unk_param;
+       sctp_disposition_t retval;
        int len;
 
        /* 6.10 Bundling
@@ -1555,7 +1551,7 @@ static sctp_disposition_t sctp_sf_do_unexpected_init(
                 * construct the parameters in INIT ACK by copying the
                 * ERROR causes over.
                 */
-               unk_param = (sctp_unrecognized_param_t *)
+               unk_param = (struct sctp_unrecognized_param *)
                            ((__u8 *)(err_chunk->chunk_hdr) +
                            sizeof(struct sctp_chunkhdr));
                /* Replace the cause code with the "Unrecognized parameter"