Skip to content

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

Delete redundant code for 2.6.23

parent 7590a655
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 18 deletions
sources/2.6.23/connect.c
View file @ f1084159
...@@ -1500,16 +1500,13 @@ ipv4_connect(struct sockaddr_in *psin_server, struct socket **csocket, ...@@ -1500,16 +1500,13 @@ 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 */ psin_server->sin_port = htons(CIFS_PORT);
if (psin_server->sin_port != htons(CIFS_PORT)) {
psin_server->sin_port = htons(CIFS_PORT);
rc = (*csocket)->ops->connect(*csocket, rc = (*csocket)->ops->connect(*csocket,
(struct sockaddr *) psin_server, (struct sockaddr *) psin_server,
sizeof (struct sockaddr_in), 0); sizeof (struct sockaddr_in), 0);
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);
...@@ -1629,16 +1626,13 @@ ipv6_connect(struct sockaddr_in6 *psin_server, struct socket **csocket) ...@@ -1629,16 +1626,13 @@ 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 */ psin_server->sin6_port = htons(CIFS_PORT);
if (psin_server->sin6_port != htons(CIFS_PORT)) {
psin_server->sin6_port = htons(CIFS_PORT);
rc = (*csocket)->ops->connect(*csocket, rc = (*csocket)->ops->connect(*csocket,
(struct sockaddr *) psin_server, (struct sockaddr *) psin_server,
sizeof (struct sockaddr_in6), 0); sizeof (struct sockaddr_in6), 0);
if (rc >= 0) if (rc >= 0)
connected = 1; connected = 1;
}
} }
if (!orig_port_error && !connected) { 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