leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

orinoco: correct timeout logic in __orinoco_hw_set_tkip_key()

Browse Source 
If the value read from HERMES_RID_TXQUEUEEMPTY becomes 0 after exactly
100 readings, we wrongly consider it a timeout.  Rewrite the clever
while loop as a for loop that does the right thing and looks simpler.

Reported by Juha Leppanen <juha_motorsportcom@luukku.com>

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Pavel Roskin 2009-04-09 21:41:05 -04:00 committed by John W. Linville
parent 23a99840d5
commit 91fe9ca74e
1 changed files with 3 additions and 5 deletions

8
drivers/net/wireless/orinoco/hw.c
View File

@ -372,15 +372,13 @@ int __orinoco_hw_set_tkip_key(hermes_t *hw, int key_idx, int set_tx,
} }
/* Wait upto 100ms for tx queue to empty */ /* Wait upto 100ms for tx queue to empty */
k = 100; for (k = 100; k > 0; k--) {
do {
k--;
udelay(1000); udelay(1000);
ret = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_TXQUEUEEMPTY, ret = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_TXQUEUEEMPTY,
&xmitting); &xmitting);
if (ret) if (ret || !xmitting)
break; break;
} while ((k > 0) && xmitting); }
if (k == 0) if (k == 0)
ret = -ETIMEDOUT; ret = -ETIMEDOUT;