sctp: remove useless arguments from get_saddr() call
Vlad Yasevich [Tue, 26 Apr 2011 21:53:20 +0000 (21:53 +0000)]
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>

include/net/sctp/structs.h
net/sctp/ipv6.c
net/sctp/protocol.c
net/sctp/transport.c

index 1d465d6..bb2f43b 100644 (file)
@@ -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 *);
index 593c801..a1913a4 100644 (file)
@@ -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;
index 3421645..68b4c43 100644 (file)
@@ -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;
index 2544b9b..1fbb920 100644 (file)
@@ -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;