path: root/include
diff options
authorTariq Toukan <tariqt@mellanox.com>2020-06-22 23:26:04 +0300
committerDavid S. Miller <davem@davemloft.net>2020-06-23 20:49:12 -0700
commit41b14fb8724d5a4b382a63cb4a1a61880347ccb8 (patch)
tree9822e7a28e953a0dd5ab520782a44eb5781585ca /include
parentnet: ethtool: Handle missing cable test TDR parameters (diff)
net: Do not clear the sock TX queue in sk_set_socket()
Clearing the sock TX queue in sk_set_socket() might cause unexpected out-of-order transmit when called from sock_orphan(), as outstanding packets can pick a different TX queue and bypass the ones already queued. This is undesired in general. More specifically, it breaks the in-order scheduling property guarantee for device-offloaded TLS sockets. Remove the call to sk_tx_queue_clear() in sk_set_socket(), and add it explicitly only where needed. Fixes: e022f0b4a03f ("net: Introduce sk_tx_queue_mapping") Signed-off-by: Tariq Toukan <tariqt@mellanox.com> Reviewed-by: Boris Pismenny <borisp@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index c53cc42b5ab9..3428619faae4 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1848,7 +1848,6 @@ static inline int sk_rx_queue_get(const struct sock *sk)
static inline void sk_set_socket(struct sock *sk, struct socket *sock)
- sk_tx_queue_clear(sk);
sk->sk_socket = sock;