diff options
| author | David S. Miller <davem@davemloft.net> | 2018-07-20 14:45:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-20 21:17:12 -0700 |
| commit | c4c5551df136a7c4edd7c2f433d9a296b39826a2 (patch) | |
| tree | a33d9f228efd34b0ad18e380385093405ef72d98 /net/sctp | |
| parent | 40999f11ce677ce3c5d0e8f5f76c40192a26b479 (diff) | |
| parent | 48e5aee81f320da8abd1f09c8410f584315f59b0 (diff) | |
| download | linux-c4c5551df136a7c4edd7c2f433d9a296b39826a2.tar.bz2 | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux
All conflicts were trivial overlapping changes, so reasonably
easy to resolve.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/transport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/transport.c b/net/sctp/transport.c index 445b7ef61677..12cac85da994 100644 --- a/net/sctp/transport.c +++ b/net/sctp/transport.c @@ -282,7 +282,7 @@ bool sctp_transport_update_pmtu(struct sctp_transport *t, u32 pmtu) if (dst) { /* Re-fetch, as under layers may have a higher minimum size */ - pmtu = SCTP_TRUNC4(dst_mtu(dst)); + pmtu = sctp_dst_mtu(dst); change = t->pathmtu != pmtu; } t->pathmtu = pmtu; |