Skip to contentSkip to conversation

orinoco: correct timeout logic in __orinoco_hw_set_tkip_key()

PATCH New Pavel Roskin 1 participant 1 message Apr 10, 2009 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 orinoco: correct timeout logic in __orinoco_hw_set_tkip_key()

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 <[email protected]>

---

 drivers/net/wireless/orinoco/hw.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
drivers/net/wireless/orinoco/hw.c +3 -5
index 081428d..632fac8 100644
@@ -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 */
-	k = 100;
-	do {
-		k--;
+	for (k = 100; k > 0; k--) {
 		udelay(1000);
 		ret = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_TXQUEUEEMPTY,
 					  &xmitting);
-		if (ret)
+		if (ret || !xmitting)
 			break;
-	} while ((k > 0) && xmitting);
+	}
 
 	if (k == 0)
 		ret = -ETIMEDOUT;