diff options
| author | Xin Long <lucien.xin@gmail.com> | 2020-10-29 15:05:05 +0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-30 15:24:25 -0700 |
| commit | bcd623d8e9fa5f82bbd8cd464dc418d24139157b (patch) | |
| tree | ca32b6424a9444acfb2ef27e4b78b3bf6b8f7647 | |
| parent | f1bfe8b5415171b5e70c2a47d399c91bd7c2752e (diff) | |
| download | lwn-bcd623d8e9fa5f82bbd8cd464dc418d24139157b.tar.gz lwn-bcd623d8e9fa5f82bbd8cd464dc418d24139157b.zip | |
sctp: call sk_setup_caps in sctp_packet_transmit instead
sk_setup_caps() was originally called in Commit 90017accff61 ("sctp:
Add GSO support"), as:
"We have to refresh this in case we are xmiting to more than one
transport at a time"
This actually happens in the loop of sctp_outq_flush_transports(),
and it shouldn't be tied to gso, so move it out of gso part and
before sctp_packet_pack().
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | net/sctp/output.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/net/sctp/output.c b/net/sctp/output.c index 1441eaf460bb..fb1650095326 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c @@ -508,12 +508,6 @@ merge: sizeof(struct inet6_skb_parm))); skb_shinfo(head)->gso_segs = pkt_count; skb_shinfo(head)->gso_size = GSO_BY_FRAGS; - rcu_read_lock(); - if (skb_dst(head) != tp->dst) { - dst_hold(tp->dst); - sk_setup_caps(sk, tp->dst); - } - rcu_read_unlock(); goto chksum; } @@ -593,6 +587,13 @@ int sctp_packet_transmit(struct sctp_packet *packet, gfp_t gfp) } skb_dst_set(head, dst); + rcu_read_lock(); + if (__sk_dst_get(sk) != tp->dst) { + dst_hold(tp->dst); + sk_setup_caps(sk, tp->dst); + } + rcu_read_unlock(); + /* pack up chunks */ pkt_count = sctp_packet_pack(packet, head, gso, gfp); if (!pkt_count) { |