From 3882f652247279d915b218ec85d4639d0babcf72 Mon Sep 17 00:00:00 2001 From: Sowmini Varadhan Date: Tue, 7 Jun 2016 10:37:28 -0700 Subject: [PATCH] RDS: TCP: Retransmit half-sent datagrams when switching sockets in rds_tcp_reset_callbacks Orabug: 23542064 Backport of upstream commit 0b6f760cff04 ("RDS: TCP: Retransmit half-sent datagrams when switching sockets in rds_tcp_reset_callbacks") When we switch a connection's sockets in rds_tcp_rest_callbacks, any partially sent datagram must be retransmitted on the new socket so that the receiver can correctly reassmble the RDS datagram. Use rds_send_reset() which is designed for this purpose. Signed-off-by: Sowmini Varadhan Acked-by: Santosh Shilimkar Signed-off-by: David S. Miller --- net/rds/send.c | 1 + net/rds/tcp.c | 1 + 2 files changed, 2 insertions(+) diff --git a/net/rds/send.c b/net/rds/send.c index 245a3d7ea17e..462889d2b468 100644 --- a/net/rds/send.c +++ b/net/rds/send.c @@ -147,6 +147,7 @@ void rds_send_reset(struct rds_connection *conn) } spin_unlock_irqrestore(&conn->c_lock, flags); } +EXPORT_SYMBOL_GPL(rds_send_reset); static int acquire_in_xmit(struct rds_connection *conn) { diff --git a/net/rds/tcp.c b/net/rds/tcp.c index 5e7b45643056..88ce595b0580 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c @@ -172,6 +172,7 @@ void rds_tcp_reset_callbacks(struct socket *sock, release_sock(osock->sk); sock_release(osock); newsock: + rds_send_reset(conn); lock_sock(sock->sk); write_lock_bh(&sock->sk->sk_callback_lock); tc->t_sock = sock; -- 2.50.1