diff options
author | Holger Schurig <hs4233@mail.mn-solutions.de> | 2008-05-14 10:30:28 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-05-21 21:47:46 -0400 |
commit | 57962f0b9d76487a660619f97c0aa811924274a0 (patch) | |
tree | d4696a45bcbdd52a139b3f6760a7d3995574aef6 /drivers/net/wireless/libertas/cmd.c | |
parent | bd9b448f4c0a514559bdae4ca18ca3e8cd999c6d (diff) |
libertas: reduce command retry time
[PATCH, take 2] libertas: reduce command retry time
In the normal case, an unsuccessful command would be retried for 10*5 seconds,
or 10*10 seconds in the worst case. This patch reduces this to 3*3 seconds,
or 3*10 seconds in the worst case.
I also reduced the time it takes to start a new command downloaded.
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/cmd.c')
-rw-r--r-- | drivers/net/wireless/libertas/cmd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c index 7ccec987faaa..2d9bbcc0dd4e 100644 --- a/drivers/net/wireless/libertas/cmd.c +++ b/drivers/net/wireless/libertas/cmd.c | |||
@@ -1136,7 +1136,7 @@ static void lbs_submit_command(struct lbs_private *priv, | |||
1136 | struct cmd_header *cmd; | 1136 | struct cmd_header *cmd; |
1137 | uint16_t cmdsize; | 1137 | uint16_t cmdsize; |
1138 | uint16_t command; | 1138 | uint16_t command; |
1139 | int timeo = 5 * HZ; | 1139 | int timeo = 3 * HZ; |
1140 | int ret; | 1140 | int ret; |
1141 | 1141 | ||
1142 | lbs_deb_enter(LBS_DEB_HOST); | 1142 | lbs_deb_enter(LBS_DEB_HOST); |
@@ -1154,7 +1154,7 @@ static void lbs_submit_command(struct lbs_private *priv, | |||
1154 | /* These commands take longer */ | 1154 | /* These commands take longer */ |
1155 | if (command == CMD_802_11_SCAN || command == CMD_802_11_ASSOCIATE || | 1155 | if (command == CMD_802_11_SCAN || command == CMD_802_11_ASSOCIATE || |
1156 | command == CMD_802_11_AUTHENTICATE) | 1156 | command == CMD_802_11_AUTHENTICATE) |
1157 | timeo = 10 * HZ; | 1157 | timeo = 5 * HZ; |
1158 | 1158 | ||
1159 | lbs_deb_cmd("DNLD_CMD: command 0x%04x, seq %d, size %d\n", | 1159 | lbs_deb_cmd("DNLD_CMD: command 0x%04x, seq %d, size %d\n", |
1160 | command, le16_to_cpu(cmd->seqnum), cmdsize); | 1160 | command, le16_to_cpu(cmd->seqnum), cmdsize); |
@@ -1166,7 +1166,7 @@ static void lbs_submit_command(struct lbs_private *priv, | |||
1166 | lbs_pr_info("DNLD_CMD: hw_host_to_card failed: %d\n", ret); | 1166 | lbs_pr_info("DNLD_CMD: hw_host_to_card failed: %d\n", ret); |
1167 | /* Let the timer kick in and retry, and potentially reset | 1167 | /* Let the timer kick in and retry, and potentially reset |
1168 | the whole thing if the condition persists */ | 1168 | the whole thing if the condition persists */ |
1169 | timeo = HZ; | 1169 | timeo = HZ/4; |
1170 | } | 1170 | } |
1171 | 1171 | ||
1172 | /* Setup the timer after transmit command */ | 1172 | /* Setup the timer after transmit command */ |