diff options
| author | Marcelo Ricardo Leitner | 2018-04-26 21:58:55 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-04-27 20:35:23 +0200 |
| commit | 2f5e3c9df6938b823664869ec87af3da8df272f6 (patch) | |
| tree | 22be567d684b1c89bc40f433099a2909fdbbfb2e /net/sctp/associola.c | |
| parent | sctp: introduce sctp_mtu_payload (diff) | |
| download | kernel-qcow2-linux-2f5e3c9df6938b823664869ec87af3da8df272f6.tar.gz kernel-qcow2-linux-2f5e3c9df6938b823664869ec87af3da8df272f6.tar.xz kernel-qcow2-linux-2f5e3c9df6938b823664869ec87af3da8df272f6.zip | |
sctp: introduce sctp_assoc_update_frag_point
and avoid the open-coded versions of it.
Now sctp_datamsg_from_user can just re-use asoc->frag_point as it will
always be updated.
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/associola.c')
| -rw-r--r-- | net/sctp/associola.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 85b362324084..a29025418b96 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c @@ -666,8 +666,6 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc, peer->pmtu_pending = 0; - asoc->frag_point = sctp_frag_point(asoc, asoc->pathmtu); - /* The asoc->peer.port might not be meaningful yet, but * initialize the packet structure anyway. */ @@ -1370,10 +1368,26 @@ sctp_assoc_choose_alter_transport(struct sctp_association *asoc, } } +void sctp_assoc_update_frag_point(struct sctp_association *asoc) +{ + int frag = sctp_mtu_payload(sctp_sk(asoc->base.sk), asoc->pathmtu, + sctp_datachk_len(&asoc->stream)); + + if (asoc->user_frag) + frag = min_t(int, frag, asoc->user_frag); + + frag = min_t(int, frag, SCTP_MAX_CHUNK_LEN - + sctp_datachk_len(&asoc->stream)); + + asoc->frag_point = SCTP_TRUNC4(frag); +} + void sctp_assoc_set_pmtu(struct sctp_association *asoc, __u32 pmtu) { - if (asoc->pathmtu != pmtu) + if (asoc->pathmtu != pmtu) { asoc->pathmtu = pmtu; + sctp_assoc_update_frag_point(asoc); + } pr_debug("%s: asoc:%p, pmtu:%d, frag_point:%d\n", __func__, asoc, asoc->pathmtu, asoc->frag_point); @@ -1403,10 +1417,6 @@ void sctp_assoc_sync_pmtu(struct sctp_association *asoc) } sctp_assoc_set_pmtu(asoc, pmtu); - asoc->frag_point = sctp_frag_point(asoc, pmtu); - - pr_debug("%s: asoc:%p, pmtu:%d, frag_point:%d\n", __func__, asoc, - asoc->pathmtu, asoc->frag_point); } /* Should we send a SACK to update our peer? */ |