sctp: remove useless arguments from get_saddr() call

[firefly-linux-kernel-4.4.55.git] / include / net / sctp / structs.h

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index cc9185ca8fd13db1d64616101f2c97222fcab6fb..bb2f43b7e9a86588df798b177df522375bc9341e 100644 (file)
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -422,7 +422,7 @@ struct sctp_cookie {
        __u32 adaptation_ind;
 
        __u8 auth_random[sizeof(sctp_paramhdr_t) + SCTP_AUTH_RANDOM_LENGTH];
-       __u8 auth_hmacs[SCTP_AUTH_NUM_HMACS + 2];
+       __u8 auth_hmacs[SCTP_AUTH_NUM_HMACS * sizeof(__u16) + 2];
        __u8 auth_chunks[sizeof(sctp_paramhdr_t) + SCTP_AUTH_MAX_CHUNKS];
 
        /* This is a shim for my peer's INIT packet, followed by
@@ -566,17 +566,14 @@ struct sctp_af {
                                         int __user *optlen);
        struct dst_entry *(*get_dst)    (struct sctp_association *asoc,
                                         union sctp_addr *daddr,
-                                        union sctp_addr *saddr);
+                                        union sctp_addr *saddr,
+                                        struct flowi *fl,
+                                        struct sock *sk);
        void            (*get_saddr)    (struct sctp_sock *sk,
-                                        struct sctp_association *asoc,
-                                        struct dst_entry *dst,
-                                        union sctp_addr *daddr,
-                                        union sctp_addr *saddr);
+                                        struct sctp_transport *t,
+                                        struct flowi *fl);
        void            (*copy_addrlist) (struct list_head *,
                                          struct net_device *);
-       void            (*dst_saddr)    (union sctp_addr *saddr,
-                                        struct dst_entry *dst,
-                                        __be16 port);
        int             (*cmp_addr)     (const union sctp_addr *addr1,
                                         const union sctp_addr *addr2);
        void            (*addr_copy)    (union sctp_addr *dst,
@@ -1061,7 +1058,7 @@ void sctp_transport_set_owner(struct sctp_transport *,
                              struct sctp_association *);
 void sctp_transport_route(struct sctp_transport *, union sctp_addr *,
                          struct sctp_sock *);
-void sctp_transport_pmtu(struct sctp_transport *);
+void sctp_transport_pmtu(struct sctp_transport *, struct sock *sk);
 void sctp_transport_free(struct sctp_transport *);
 void sctp_transport_reset_timers(struct sctp_transport *);
 void sctp_transport_hold(struct sctp_transport *);
@@ -1400,7 +1397,7 @@ int sctp_has_association(const union sctp_addr *laddr,
 int sctp_verify_init(const struct sctp_association *asoc, sctp_cid_t,
                     sctp_init_chunk_t *peer_init, struct sctp_chunk *chunk,
                     struct sctp_chunk **err_chunk);
-int sctp_process_init(struct sctp_association *, sctp_cid_t cid,
+int sctp_process_init(struct sctp_association *, struct sctp_chunk *chunk,
                      const union sctp_addr *peer,
                      sctp_init_chunk_t *init, gfp_t gfp);
 __u32 sctp_generate_tag(const struct sctp_endpoint *);