sctp: remove useless arguments from get_saddr() call

There is no point in passing a destination address to
a get_saddr() call.

Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 1d465d62f34f6571fee8cf5ec4a5bd4c5c58434b..bb2f43b7e9a86588df798b177df522375bc9341e 100644 (file)
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -571,7 +571,6 @@ struct sctp_af {
                                         struct sock *sk);
        void            (*get_saddr)    (struct sctp_sock *sk,
                                         struct sctp_transport *t,
-                                        union sctp_addr *daddr,
                                         struct flowi *fl);
        void            (*copy_addrlist) (struct list_head *,
                                          struct net_device *);

diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 593c80162913062f6f8c90bcfd716952605c26dd..a1913a4b6f3a0fedf5031f2390b1595ea0171742 100644 (file)
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -365,15 +365,12 @@ static inline int sctp_v6_addr_match_len(union sctp_addr *s1,
  */
 static void sctp_v6_get_saddr(struct sctp_sock *sk,
                              struct sctp_transport *t,
-                             union sctp_addr *daddr,
                              struct flowi *fl)
 {
        struct flowi6 *fl6 = &fl->u.ip6;
        union sctp_addr *saddr = &t->saddr;
 
-       SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p daddr:%pI6 ",
-                         __func__, t->asoc, t->dst, &daddr->v6.sin6_addr);
-
+       SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p\n", __func__, t->asoc, t->dst);
 
        if (t->dst) {
                saddr->v6.sin6_family = AF_INET6;

diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 34216458ded1389836f3b72a7848127c0ffe7b19..68b4c4317d61d53330e526317001c42d7627bf44 100644 (file)
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -562,7 +562,6 @@ out:
  */
 static void sctp_v4_get_saddr(struct sctp_sock *sk,
                              struct sctp_transport *t,
-                             union sctp_addr *daddr,
                              struct flowi *fl)
 {
        union sctp_addr *saddr = &t->saddr;

diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index 2544b9b21f869e33202fff56d05cde86b974928a..1fbb920f8dfbd0b406053e8678d05c9682e27e2c 100644 (file)
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -284,7 +284,7 @@ void sctp_transport_route(struct sctp_transport *transport,
        if (saddr)
                memcpy(&transport->saddr, saddr, sizeof(union sctp_addr));
        else
-               af->get_saddr(opt, transport, daddr, &fl);
+               af->get_saddr(opt, transport, &fl);
 
        if ((transport->param_flags & SPP_PMTUD_DISABLE) && transport->pathmtu) {
                return;