diff options
-rw-r--r-- | net/rds/send.c | 1 | ||||
-rw-r--r-- | net/rds/tcp.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/rds/send.c b/net/rds/send.c index c9cdb358ea88..b1962f8e30f7 100644 --- a/net/rds/send.c +++ b/net/rds/send.c | |||
@@ -99,6 +99,7 @@ void rds_send_reset(struct rds_connection *conn) | |||
99 | list_splice_init(&conn->c_retrans, &conn->c_send_queue); | 99 | list_splice_init(&conn->c_retrans, &conn->c_send_queue); |
100 | spin_unlock_irqrestore(&conn->c_lock, flags); | 100 | spin_unlock_irqrestore(&conn->c_lock, flags); |
101 | } | 101 | } |
102 | EXPORT_SYMBOL_GPL(rds_send_reset); | ||
102 | 103 | ||
103 | static int acquire_in_xmit(struct rds_connection *conn) | 104 | static int acquire_in_xmit(struct rds_connection *conn) |
104 | { | 105 | { |
diff --git a/net/rds/tcp.c b/net/rds/tcp.c index 8faa0b1ae39d..7ab1b41ffc88 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c | |||
@@ -173,6 +173,7 @@ void rds_tcp_reset_callbacks(struct socket *sock, | |||
173 | release_sock(osock->sk); | 173 | release_sock(osock->sk); |
174 | sock_release(osock); | 174 | sock_release(osock); |
175 | newsock: | 175 | newsock: |
176 | rds_send_reset(conn); | ||
176 | lock_sock(sock->sk); | 177 | lock_sock(sock->sk); |
177 | write_lock_bh(&sock->sk->sk_callback_lock); | 178 | write_lock_bh(&sock->sk->sk_callback_lock); |
178 | tc->t_sock = sock; | 179 | tc->t_sock = sock; |