sctp: cache the ipv6 source after route lookup

The ipv6 routing lookup does give us a source address,
but instead of filling it into the dst, it's stored in
the flowi.  We can use that instead of going through the
entire source address selection again.
Also the useless ->dst_saddr member of sctp_pf is removed.
And sctp_v6_dst_saddr() is removed, instead by introduce
sctp_v6_to_addr(), which can be reused to cleanup some dup
code.

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>

1 files changed, 6 insertions, 8 deletions

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 5c9bada51d2d..1d465d62f34f 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -566,17 +566,15 @@ 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,
+                                         struct sctp_transport *t,
                                          union sctp_addr *daddr,
-                                         union sctp_addr *saddr);
+                                         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 +1059,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 *);