Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 070f944a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: set socket send and receive timeouts before attempting connect
parents b775c389 ee1b3ea9

fs/cifs/connect.c

+8 −8
Original line number Diff line number Diff line
@@ -2474,14 +2474,6 @@ generic_ip_connect(struct TCP_Server_Info *server) 
	if (rc < 0)

		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

	 * the default. sock_setsockopt not used because it expects
@@ -2510,6 +2502,14 @@ generic_ip_connect(struct TCP_Server_Info *server) 
		 socket->sk->sk_sndbuf,

		 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))

		rc = ip_rfc1001_connect(server);