diff options
| author | Xin Long <lucien.xin@gmail.com> | 2018-11-18 16:14:47 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-19 12:42:47 -0800 |
| commit | 69fec325a64383667b8a35df5d48d6ce52fb2782 (patch) | |
| tree | 4d0a66f010fc1ce454530fc99e1c0f767010f3c2 | |
| parent | cc3ccf26f0649089b3a34a2781977755ea36e72c (diff) | |
| download | linux-69fec325a64383667b8a35df5d48d6ce52fb2782.tar.gz linux-69fec325a64383667b8a35df5d48d6ce52fb2782.tar.bz2 linux-69fec325a64383667b8a35df5d48d6ce52fb2782.zip | |
Revert "sctp: remove sctp_transport_pmtu_check"
This reverts commit 22d7be267eaa8114dcc28d66c1c347f667d7878a.
The dst's mtu in transport can be updated by a non sctp place like
in xfrm where the MTU information didn't get synced between asoc,
transport and dst, so it is still needed to do the pmtu check
in sctp_packet_config.
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/sctp/sctp.h | 12 | ||||
| -rw-r--r-- | net/sctp/output.c | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 8c2caa370e0f..ab9242e51d9e 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h @@ -608,4 +608,16 @@ static inline __u32 sctp_dst_mtu(const struct dst_entry *dst) SCTP_DEFAULT_MINSEGMENT)); } +static inline bool sctp_transport_pmtu_check(struct sctp_transport *t) +{ + __u32 pmtu = sctp_dst_mtu(t->dst); + + if (t->pathmtu == pmtu) + return true; + + t->pathmtu = pmtu; + + return false; +} + #endif /* __net_sctp_h__ */ diff --git a/net/sctp/output.c b/net/sctp/output.c index 88dfa6ae1fb4..b0e74a3e77ec 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c @@ -118,6 +118,9 @@ void sctp_packet_config(struct sctp_packet *packet, __u32 vtag, sctp_transport_route(tp, NULL, sp); if (asoc->param_flags & SPP_PMTUD_ENABLE) sctp_assoc_sync_pmtu(asoc); + } else if (!sctp_transport_pmtu_check(tp)) { + if (asoc->param_flags & SPP_PMTUD_ENABLE) + sctp_assoc_sync_pmtu(asoc); } if (asoc->pmtu_pending) { |