From 884b52dc23a4fda37d15bb76d08e978b0cb67d2b Mon Sep 17 00:00:00 2001
From: Ivo van Doorn <ivdoorn@gmail.com>
Date: Sun, 3 Feb 2008 15:47:30 +0100
Subject: [PATCH] --- yaml --- r: 89855 b: refs/heads/master c:
 3b3618ad5117331b6fa7cafc41fc18935709e569 h: refs/heads/master i:   89853:
 9571f6894eb326aeefde52ef57d0d2c3bdd8dbf2   89851:
 2f1f851da04be8804d372dd6cae9b4f590899ae5   89847:
 64f14d80abfd46c86ab87a36d79124ffa51eb660   89839:
 ec79f0a9c55842e79ce2e4590645f85b48a3f61e   89823:
 8efb6930f95196ec0514fe5e742aa404c51dc931   89791:
 c8b47ee52c78b44d55dd0ecb2e170916aab2299d   89727:
 3a9d8d4902690dc2aaa813c958626ed87dcd120f   89599:
 9e65dc4071bf640e30c271032b963382b0b73f02 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5e5f90c30434..8fb7487aec13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7bafff3f94efd850f8744d683e63812ff8d55c5
+refs/heads/master: 3b3618ad5117331b6fa7cafc41fc18935709e569
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00mac.c b/trunk/drivers/net/wireless/rt2x00/rt2x00mac.c
index 411ed5d08598..380cc5b33131 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/trunk/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -396,17 +396,17 @@ int rt2x00mac_conf_tx(struct ieee80211_hw *hw, int queue_idx,
 	 * The passed variables are stored as real value ((2^n)-1).
 	 * Ralink registers require to know the bit number 'n'.
 	 */
-	if (params->cw_min)
+	if (params->cw_min > 0)
 		queue->cw_min = fls(params->cw_min);
 	else
 		queue->cw_min = 5; /* cw_min: 2^5 = 32. */
 
-	if (params->cw_max)
+	if (params->cw_max > 0)
 		queue->cw_max = fls(params->cw_max);
 	else
 		queue->cw_max = 10; /* cw_min: 2^10 = 1024. */
 
-	if (params->aifs)
+	if (params->aifs >= 0)
 		queue->aifs = params->aifs;
 	else
 		queue->aifs = 2;