Skip to content

E
etercifs
Commit 7590a655 authored by Pavel Shilovsky's avatar Pavel Shilovsky
Browse files
Options

Delete redundant code for 2.6.16

parent e9c3671e
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 6 deletions
sources/2.6.16/connect.c
View file @ 7590a655
...@@ -1557,8 +1557,6 @@ ipv4_connect(struct sockaddr_in *psin_server, struct socket **csocket, ...@@ -1557,8 +1557,6 @@ ipv4_connect(struct sockaddr_in *psin_server, struct socket **csocket,
} }
if (!orig_port_error && !connected) { if (!orig_port_error && !connected) {
/* do not retry on the same port we just failed on */
if (psin_server->sin_port != htons(CIFS_PORT)) {
psin_server->sin_port = htons(CIFS_PORT); psin_server->sin_port = htons(CIFS_PORT);
rc = (*csocket)->ops->connect(*csocket, rc = (*csocket)->ops->connect(*csocket,
...@@ -1567,7 +1565,6 @@ ipv4_connect(struct sockaddr_in *psin_server, struct socket **csocket, ...@@ -1567,7 +1565,6 @@ ipv4_connect(struct sockaddr_in *psin_server, struct socket **csocket,
if (rc >= 0) if (rc >= 0)
connected = 1; connected = 1;
} }
}
if (!orig_port_error && !connected) { if (!orig_port_error && !connected) {
psin_server->sin_port = htons(RFC1001_PORT); psin_server->sin_port = htons(RFC1001_PORT);
...@@ -1702,8 +1699,6 @@ ipv6_connect(struct sockaddr_in6 *psin_server, struct socket **csocket) ...@@ -1702,8 +1699,6 @@ ipv6_connect(struct sockaddr_in6 *psin_server, struct socket **csocket)
} }
if (!orig_port_error && !connected) { if (!orig_port_error && !connected) {
/* do not retry on the same port we just failed on */
if (psin_server->sin6_port != htons(CIFS_PORT)) {
psin_server->sin6_port = htons(CIFS_PORT); psin_server->sin6_port = htons(CIFS_PORT);
rc = (*csocket)->ops->connect(*csocket, rc = (*csocket)->ops->connect(*csocket,
...@@ -1712,7 +1707,7 @@ ipv6_connect(struct sockaddr_in6 *psin_server, struct socket **csocket) ...@@ -1712,7 +1707,7 @@ ipv6_connect(struct sockaddr_in6 *psin_server, struct socket **csocket)
if (rc >= 0) if (rc >= 0)
connected = 1; connected = 1;
} }
}
if (!orig_port_error && !connected) { if (!orig_port_error && !connected) {
psin_server->sin6_port = htons(RFC1001_PORT); psin_server->sin6_port = htons(RFC1001_PORT);
rc = (*csocket)->ops->connect(*csocket, (struct sockaddr *) rc = (*csocket)->ops->connect(*csocket, (struct sockaddr *)
......
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