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