diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-04-10 17:40:42 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-10 17:40:42 -0400 |
| commit | b769fefb68cd70385d68220ae341e5a10723fbc0 (patch) | |
| tree | a2881410c9dc5a3474619d155fac981cfbd4ee8f /net/sctp/input.c | |
| parent | 1420f63b8207e966f54caec26d08abdc2ff37193 (diff) | |
| parent | 39da7c509acff13fc8cb12ec1bb20337c988ed36 (diff) | |
Backmerge tag 'v4.11-rc6' into drm-next
Linux 4.11-rc6
drm-misc needs 4.11-rc5, may as well fix conflicts with rc6.
Diffstat (limited to 'net/sctp/input.c')
| -rw-r--r-- | net/sctp/input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/input.c b/net/sctp/input.c index 2a28ab20487f..0e06a278d2a9 100644 --- a/net/sctp/input.c +++ b/net/sctp/input.c | |||
| @@ -401,10 +401,10 @@ void sctp_icmp_frag_needed(struct sock *sk, struct sctp_association *asoc, | |||
| 401 | 401 | ||
| 402 | if (t->param_flags & SPP_PMTUD_ENABLE) { | 402 | if (t->param_flags & SPP_PMTUD_ENABLE) { |
| 403 | /* Update transports view of the MTU */ | 403 | /* Update transports view of the MTU */ |
| 404 | sctp_transport_update_pmtu(sk, t, pmtu); | 404 | sctp_transport_update_pmtu(t, pmtu); |
| 405 | 405 | ||
| 406 | /* Update association pmtu. */ | 406 | /* Update association pmtu. */ |
| 407 | sctp_assoc_sync_pmtu(sk, asoc); | 407 | sctp_assoc_sync_pmtu(asoc); |
| 408 | } | 408 | } |
| 409 | 409 | ||
| 410 | /* Retransmit with the new pmtu setting. | 410 | /* Retransmit with the new pmtu setting. |