Skip to content

E
etercifs
Commit 1b5f7623 authored by Pavel Shilovsky's avatar Pavel Shilovsky
Browse files
Options

Delete redundant code for 2.6.31

parent 2ee78754
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 19 deletions
sources/2.6.31/connect.c
View file @ 1b5f7623
......@@ -1785,16 +1785,13 @@ ipv4_connect(struct TCP_Server_Info *server)
}
if (!orig_port_error && !connected) {
/* do not retry on the same port we just failed on */
if (server->addr.sockAddr.sin_port != htons(CIFS_PORT)) {
server->addr.sockAddr.sin_port = htons(CIFS_PORT);
rc = socket->ops->connect(socket,
(struct sockaddr *)
&server->addr.sockAddr,
sizeof(struct sockaddr_in), 0);
if (rc >= 0)
connected = true;
}
server->addr.sockAddr.sin_port = htons(CIFS_PORT);
rc = socket->ops->connect(socket,
(struct sockaddr *)
&server->addr.sockAddr,
sizeof(struct sockaddr_in), 0);
if (rc >= 0)
connected = true;
}
if (!orig_port_error && !connected) {
......@@ -1934,15 +1931,12 @@ ipv6_connect(struct TCP_Server_Info *server)
}
if (!orig_port_error && !connected) {
/* do not retry on the same port we just failed on */
if (server->addr.sockAddr6.sin6_port != htons(CIFS_PORT)) {
server->addr.sockAddr6.sin6_port = htons(CIFS_PORT);
rc = socket->ops->connect(socket, (struct sockaddr *)
&server->addr.sockAddr6,
sizeof(struct sockaddr_in6), 0);
if (rc >= 0)
connected = true;
}
server->addr.sockAddr6.sin6_port = htons(CIFS_PORT);
rc = socket->ops->connect(socket, (struct sockaddr *)
&server->addr.sockAddr6,
sizeof(struct sockaddr_in6), 0);
if (rc >= 0)
connected = true;
}
if (!orig_port_error && !connected) {
......
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