Skip to content

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

Delete redundant code for centos54

parent 91ced147
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 19 deletions
sources/centos54/connect.c
View file @ e5c7723d
...@@ -1831,16 +1831,13 @@ ipv4_connect(struct TCP_Server_Info *server) ...@@ -1831,16 +1831,13 @@ 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 */ server->addr.sockAddr.sin_port = htons(CIFS_PORT);
if (server->addr.sockAddr.sin_port != htons(CIFS_PORT)) { rc = socket->ops->connect(socket,
server->addr.sockAddr.sin_port = htons(CIFS_PORT); (struct sockaddr *)
rc = socket->ops->connect(socket, &server->addr.sockAddr,
(struct sockaddr *) sizeof(struct sockaddr_in), 0);
&server->addr.sockAddr, if (rc >= 0)
sizeof(struct sockaddr_in), 0); connected = true;
if (rc >= 0)
connected = true;
}
} }
if (!orig_port_error && !connected) { if (!orig_port_error && !connected) {
...@@ -1981,15 +1978,12 @@ ipv6_connect(struct TCP_Server_Info *server) ...@@ -1981,15 +1978,12 @@ 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 */ server->addr.sockAddr6.sin6_port = htons(CIFS_PORT);
if (server->addr.sockAddr6.sin6_port != htons(CIFS_PORT)) { rc = socket->ops->connect(socket, (struct sockaddr *)
server->addr.sockAddr6.sin6_port = htons(CIFS_PORT); &server->addr.sockAddr6,
rc = socket->ops->connect(socket, (struct sockaddr *) sizeof(struct sockaddr_in6), 0);
&server->addr.sockAddr6, if (rc >= 0)
sizeof(struct sockaddr_in6), 0); connected = true;
if (rc >= 0)
connected = true;
}
} }
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