Skip to content

E
etercifs
Commit 86e98a1d authored by Pavel Shilovsky's avatar Pavel Shilovsky
Browse files
Options

Delete redundant code for 2.6.32

parent 1b5f7623
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
sources/2.6.32/connect.c
View file @ 86e98a1d
...@@ -1792,8 +1792,6 @@ ipv4_connect(struct TCP_Server_Info *server) ...@@ -1792,8 +1792,6 @@ ipv4_connect(struct TCP_Server_Info *server)
} }
if (!orig_port_error && !connected) { 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); server->addr.sockAddr.sin_port = htons(CIFS_PORT);
rc = socket->ops->connect(socket, rc = socket->ops->connect(socket,
(struct sockaddr *) (struct sockaddr *)
...@@ -1802,7 +1800,6 @@ ipv4_connect(struct TCP_Server_Info *server) ...@@ -1802,7 +1800,6 @@ ipv4_connect(struct TCP_Server_Info *server)
if (rc >= 0) if (rc >= 0)
connected = true; connected = true;
} }
}
if (!orig_port_error && !connected) { if (!orig_port_error && !connected) {
server->addr.sockAddr.sin_port = htons(RFC1001_PORT); server->addr.sockAddr.sin_port = htons(RFC1001_PORT);
...@@ -1941,8 +1938,6 @@ ipv6_connect(struct TCP_Server_Info *server) ...@@ -1941,8 +1938,6 @@ ipv6_connect(struct TCP_Server_Info *server)
} }
if (!orig_port_error && !connected) { 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); server->addr.sockAddr6.sin6_port = htons(CIFS_PORT);
rc = socket->ops->connect(socket, (struct sockaddr *) rc = socket->ops->connect(socket, (struct sockaddr *)
&server->addr.sockAddr6, &server->addr.sockAddr6,
...@@ -1950,7 +1945,6 @@ ipv6_connect(struct TCP_Server_Info *server) ...@@ -1950,7 +1945,6 @@ ipv6_connect(struct TCP_Server_Info *server)
if (rc >= 0) if (rc >= 0)
connected = true; connected = true;
} }
}
if (!orig_port_error && !connected) { if (!orig_port_error && !connected) {
server->addr.sockAddr6.sin6_port = htons(RFC1001_PORT); server->addr.sockAddr6.sin6_port = htons(RFC1001_PORT);
......
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