Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[firefly-linux-kernel-4.4.55.git] / net / rds / tcp_connect.c

diff --git a/net/rds/tcp_connect.c b/net/rds/tcp_connect.c
index a65ee78db0c54e1062186b9b132fe46fac380c91..f9f564a6c960e47b3c243d11a3e11317c5a56353 100644 (file)
--- a/net/rds/tcp_connect.c
+++ b/net/rds/tcp_connect.c
@@ -106,11 +106,14 @@ int rds_tcp_conn_connect(struct rds_connection *conn)
        rds_tcp_set_callbacks(sock, conn);
        ret = sock->ops->connect(sock, (struct sockaddr *)&dest, sizeof(dest),
                                 O_NONBLOCK);
-       sock = NULL;
 
        rdsdebug("connect to address %pI4 returned %d\n", &conn->c_faddr, ret);
        if (ret == -EINPROGRESS)
                ret = 0;
+       if (ret == 0)
+               sock = NULL;
+       else
+               rds_tcp_restore_callbacks(sock, conn->c_transport_data);
 
 out:
        if (sock)