sctp: remove the typedef sctp_param_t

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

It is also to remove the useless declaration sctp_addip_addr_config
and fix the lack of params for some other functions' declaration.

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 142bb6aa88ebde31f474a11337e90f387d98eede..5eecc0f14650aa71cd713d0ae73a81621f59dc88 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -167,7 +167,7 @@ struct sctp_paramhdr {
        __be16 length;
 };
 
-typedef enum {
+enum sctp_param {
 
        /* RFC 2960 Section 3.3.5 */
        SCTP_PARAM_HEARTBEAT_INFO               = cpu_to_be16(1),
@@ -207,7 +207,7 @@ typedef enum {
        SCTP_PARAM_RESET_RESPONSE               = cpu_to_be16(0x0010),
        SCTP_PARAM_RESET_ADD_OUT_STREAMS        = cpu_to_be16(0x0011),
        SCTP_PARAM_RESET_ADD_IN_STREAMS         = cpu_to_be16(0x0012),
-} sctp_param_t; /* enum */
+}; /* enum */
 
 
 /* RFC 2960 Section 3.2.1

diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
index 47113f2c4b0a2b6c596d2f28018a1e1941cb6ede..245eb22230a2369ba6fa91520a5b31e55bc57824 100644 (file)
--- a/include/net/sctp/sm.h
+++ b/include/net/sctp/sm.h
@@ -325,19 +325,17 @@ void sctp_generate_heartbeat_event(unsigned long peer);
 void sctp_generate_reconf_event(unsigned long peer);
 void sctp_generate_proto_unreach_event(unsigned long peer);
 
-void sctp_ootb_pkt_free(struct sctp_packet *);
+void sctp_ootb_pkt_free(struct sctp_packet *packet);
 
-struct sctp_association *sctp_unpack_cookie(const struct sctp_endpoint *,
-                                      const struct sctp_association *,
-                                      struct sctp_chunk *,
+struct sctp_association *sctp_unpack_cookie(const struct sctp_endpoint *ep,
+                                      const struct sctp_association *asoc,
+                                      struct sctp_chunk *chunk,
                                       gfp_t gfp, int *err,
                                       struct sctp_chunk **err_chk_p);
-int sctp_addip_addr_config(struct sctp_association *, sctp_param_t,
-                          struct sockaddr_storage*, int);
 
 /* 3rd level prototypes */
-__u32 sctp_generate_tag(const struct sctp_endpoint *);
-__u32 sctp_generate_tsn(const struct sctp_endpoint *);
+__u32 sctp_generate_tag(const struct sctp_endpoint *ep);
+__u32 sctp_generate_tsn(const struct sctp_endpoint *ep);
 
 /* Extern declarations for major data structures.  */
 extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 9f9d40c9a32a1c4cd0a2020c98f88ac5084223be..3ed2108d1989e8f95d1a64c5dfadb59a32e3053f 100644 (file)
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -1882,7 +1882,7 @@ struct __sctp_missing {
  * Report a missing mandatory parameter.
  */
 static int sctp_process_missing_param(const struct sctp_association *asoc,
-                                     sctp_param_t paramtype,
+                                     enum sctp_param paramtype,
                                      struct sctp_chunk *chunk,
                                      struct sctp_chunk **errp)
 {