sctp: move transport pathmtu calc away of sctp_assoc_add_peer

There was only one case that sctp_assoc_add_peer couldn't handle, which
is when SPP_PMTUD_DISABLE is set and pathmtu not initialized.
So add this situation to sctp_transport_route and reuse what was
already in there.

Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index a8f3b088fcb2ac82f58b7d6fb8894fe712e2bc0a..b3aa95222bd52113295cb246c503c903bdd5c353 100644 (file)
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -652,15 +652,8 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
         */
        peer->param_flags = asoc->param_flags;
 
-       sctp_transport_route(peer, NULL, sp);
-
        /* Initialize the pmtu of the transport. */
-       if (peer->param_flags & SPP_PMTUD_DISABLE) {
-               if (asoc->pathmtu)
-                       peer->pathmtu = asoc->pathmtu;
-               else
-                       peer->pathmtu = SCTP_DEFAULT_MAXSEGMENT;
-       }
+       sctp_transport_route(peer, NULL, sp);
 
        /* If this is the first transport addr on this association,
         * initialize the association PMTU to the peer's PMTU.

diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index 47f82bd794d915188bad037463c2aa14175a55ef..c5fc3aed08a18658448b528b07dbb13900686313 100644 (file)
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -307,11 +307,15 @@ void sctp_transport_route(struct sctp_transport *transport,
                 * association's active path for getsockname().
                 */
                if (asoc && (!asoc->peer.primary_path ||
-                               (transport == asoc->peer.active_path)))
+                            (transport == asoc->peer.active_path)))
                        opt->pf->to_sk_saddr(&transport->saddr,
                                             asoc->base.sk);
-       } else
+       } else if ((transport->param_flags & SPP_PMTUD_DISABLE) &&
+                  asoc && asoc->pathmtu) {
+               transport->pathmtu = asoc->pathmtu;
+       } else {
                transport->pathmtu = SCTP_DEFAULT_MAXSEGMENT;
+       }
 }
 
 /* Hold a reference to a transport.  */