s3:libsmb: get rid of cli_state_max_requests

Signed-off-by: Luk Claes <luk@debian.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 92a62bb437c023722acf993d96df6d986add73ad..d627f7520b3e149cb9cd628b18a0ec5cdcf86f07 100644 (file)
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -443,11 +443,6 @@ uint32_t cli_state_available_size(struct cli_state *cli, uint32_t ofs)
        return ret;
 }
 
-uint16_t cli_state_max_requests(struct cli_state *cli)
-{
-       return smbXcli_conn_max_requests(cli->conn);
-}
-
 const uint8_t *cli_state_server_challenge(struct cli_state *cli)
 {
        return smb1cli_conn_server_challenge(cli->conn);

diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index ac200c7ffdcdff77789e07c20cbcc5777cf04028..5e2e94345d2f1e63334c150087954e44b9f06cdf 100644 (file)
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -513,7 +513,7 @@ struct tevent_req *cli_pull_send(TALLOC_CTX *mem_ctx,
                state->chunk_size &= ~(page_size - 1);
        }
 
-       state->max_reqs = cli_state_max_requests(cli);
+       state->max_reqs = smbXcli_conn_max_requests(cli->conn);
 
        state->num_reqs = MAX(window_size/state->chunk_size, 1);
        state->num_reqs = MIN(state->num_reqs, state->max_reqs);
@@ -1215,7 +1215,7 @@ struct tevent_req *cli_push_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
                state->chunk_size &= ~(page_size - 1);
        }
 
-       state->max_reqs = cli_state_max_requests(cli);
+       state->max_reqs = smbXcli_conn_max_requests(cli->conn);
 
        if (window_size == 0) {
                window_size = state->max_reqs * state->chunk_size;

diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 294e2a7b76b877318b34d4c370013994e95cbb13..f633ed1e842126d009b9d93ff8dfef282ddc5925 100644 (file)
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -182,7 +182,6 @@ uint16_t cli_state_get_uid(struct cli_state *cli);
 uint16_t cli_state_set_uid(struct cli_state *cli, uint16_t uid);
 bool cli_set_case_sensitive(struct cli_state *cli, bool case_sensitive);
 uint32_t cli_state_available_size(struct cli_state *cli, uint32_t ofs);
-uint16_t cli_state_max_requests(struct cli_state *cli);
 const uint8_t *cli_state_server_challenge(struct cli_state *cli);
 const DATA_BLOB *cli_state_server_gss_blob(struct cli_state *cli);
 uint16_t cli_state_security_mode(struct cli_state *cli);