sctp: cache the ipv6 source after route lookup

[~andy/linux] / net / sctp / transport.c

diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index 132046cb82fc764ae758a0535aad8816946ae1d2..2544b9b21f869e33202fff56d05cde86b974928a 100644 (file)
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -48,6 +48,8 @@
  * be incorporated into the next SCTP release.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/random.h>
@@ -209,11 +211,15 @@ void sctp_transport_set_owner(struct sctp_transport *transport,
 }
 
 /* Initialize the pmtu of a transport. */
-void sctp_transport_pmtu(struct sctp_transport *transport)
+void sctp_transport_pmtu(struct sctp_transport *transport, struct sock *sk)
 {
        struct dst_entry *dst;
+       struct flowi fl;
 
-       dst = transport->af_specific->get_dst(NULL, &transport->ipaddr, NULL);
+       dst = transport->af_specific->get_dst(transport->asoc,
+                                             &transport->ipaddr,
+                                             &transport->saddr,
+                                             &fl, sk);
 
        if (dst) {
                transport->pathmtu = dst_mtu(dst);
@@ -244,10 +250,9 @@ void sctp_transport_update_pmtu(struct sctp_transport *t, u32 pmtu)
        struct dst_entry *dst;
 
        if (unlikely(pmtu < SCTP_DEFAULT_MINSEGMENT)) {
-               printk(KERN_WARNING "%s: Reported pmtu %d too low, "
-                      "using default minimum of %d\n",
-                      __func__, pmtu,
-                      SCTP_DEFAULT_MINSEGMENT);
+               pr_warn("%s: Reported pmtu %d too low, using default minimum of %d\n",
+                       __func__, pmtu,
+                       SCTP_DEFAULT_MINSEGMENT);
                /* Use default minimum segment size and disable
                 * pmtu discovery on this transport.
                 */
@@ -271,15 +276,16 @@ void sctp_transport_route(struct sctp_transport *transport,
        struct sctp_af *af = transport->af_specific;
        union sctp_addr *daddr = &transport->ipaddr;
        struct dst_entry *dst;
+       struct flowi fl;
 
-       dst = af->get_dst(asoc, daddr, saddr);
+       dst = af->get_dst(asoc, daddr, saddr, &fl, sctp_opt2sk(opt));
+       transport->dst = dst;
 
        if (saddr)
                memcpy(&transport->saddr, saddr, sizeof(union sctp_addr));
        else
-               af->get_saddr(opt, asoc, dst, daddr, &transport->saddr);
+               af->get_saddr(opt, transport, daddr, &fl);
 
-       transport->dst = dst;
        if ((transport->param_flags & SPP_PMTUD_DISABLE) && transport->pathmtu) {
                return;
        }