diff options
| author | Marcelo Ricardo Leitner | 2018-04-26 21:58:59 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-04-27 20:35:23 +0200 |
| commit | 6e91b578bf3f9e19c250835cba97a4be38ffcb31 (patch) | |
| tree | 9985910ee8df0b0e20cefbf64aa9881132f202ab /net/sctp/socket.c | |
| parent | sctp: remove sctp_transport_pmtu_check (diff) | |
| download | kernel-qcow2-linux-6e91b578bf3f9e19c250835cba97a4be38ffcb31.tar.gz kernel-qcow2-linux-6e91b578bf3f9e19c250835cba97a4be38ffcb31.tar.xz kernel-qcow2-linux-6e91b578bf3f9e19c250835cba97a4be38ffcb31.zip | |
sctp: re-use sctp_transport_pmtu in sctp_transport_route
sctp_transport_route currently is very similar to sctp_transport_pmtu plus
a few other bits.
This patch reuses sctp_transport_pmtu in sctp_transport_route and removes
the duplicated code.
Also, as all calls to sctp_transport_route were forcing the dst release
before calling it, let's just include such release too.
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/socket.c')
| -rw-r--r-- | net/sctp/socket.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index a93b60a28cc5..bb08d44b838b 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -644,16 +644,15 @@ static int sctp_send_asconf_add_ip(struct sock *sk, list_for_each_entry(trans, &asoc->peer.transport_addr_list, transports) { - /* Clear the source and route cache */ - sctp_transport_dst_release(trans); trans->cwnd = min(4*asoc->pathmtu, max_t(__u32, 2*asoc->pathmtu, 4380)); trans->ssthresh = asoc->peer.i.a_rwnd; trans->rto = asoc->rto_initial; sctp_max_rto(asoc, trans); trans->rtt = trans->srtt = trans->rttvar = 0; + /* Clear the source and route cache */ sctp_transport_route(trans, NULL, - sctp_sk(asoc->base.sk)); + sctp_sk(asoc->base.sk)); } } retval = sctp_send_asconf(asoc, chunk); @@ -896,7 +895,6 @@ skip_mkasconf: */ list_for_each_entry(transport, &asoc->peer.transport_addr_list, transports) { - sctp_transport_dst_release(transport); sctp_transport_route(transport, NULL, sctp_sk(asoc->base.sk)); } |