Commit 070f944a authored by Linus Torvalds's avatar Linus Torvalds
parents b775c389 ee1b3ea9
...@@ -2474,14 +2474,6 @@ generic_ip_connect(struct TCP_Server_Info *server) ...@@ -2474,14 +2474,6 @@ generic_ip_connect(struct TCP_Server_Info *server)
if (rc < 0) if (rc < 0)
return rc; return rc;
rc = socket->ops->connect(socket, saddr, slen, 0);
if (rc < 0) {
cFYI(1, "Error %d connecting to server", rc);
sock_release(socket);
server->ssocket = NULL;
return rc;
}
/* /*
* Eventually check for other socket options to change from * Eventually check for other socket options to change from
* the default. sock_setsockopt not used because it expects * the default. sock_setsockopt not used because it expects
...@@ -2510,6 +2502,14 @@ generic_ip_connect(struct TCP_Server_Info *server) ...@@ -2510,6 +2502,14 @@ generic_ip_connect(struct TCP_Server_Info *server)
socket->sk->sk_sndbuf, socket->sk->sk_sndbuf,
socket->sk->sk_rcvbuf, socket->sk->sk_rcvtimeo); socket->sk->sk_rcvbuf, socket->sk->sk_rcvtimeo);
rc = socket->ops->connect(socket, saddr, slen, 0);
if (rc < 0) {
cFYI(1, "Error %d connecting to server", rc);
sock_release(socket);
server->ssocket = NULL;
return rc;
}
if (sport == htons(RFC1001_PORT)) if (sport == htons(RFC1001_PORT))
rc = ip_rfc1001_connect(server); rc = ip_rfc1001_connect(server);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment