From d7024edd83bddb15f1c8e985d0c9605d9dab882b Mon Sep 17 00:00:00 2001
From: Kalle Valo <kalle.valo@nokia.com>
Date: Mon, 30 Nov 2009 10:18:47 +0200
Subject: [PATCH] --- yaml --- r: 183267 b: refs/heads/master c:
 da2fb4e9c215b8f0f8954818691549f8a34135be h: refs/heads/master i:   183265:
 273cc699395ea1baa5d494655e39c69cecf4b859   183263:
 d3a0551c5f703101269b852a1efa61866f5a0dc9 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/net/wireless/wl12xx/wl1251_main.c | 2 ++
 trunk/drivers/net/wireless/wl12xx/wl1251_tx.h   | 3 ---
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 712a6f5bebf9..cbea148e9408 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46cb35f5e761306b031029af2061ea263359a764
+refs/heads/master: da2fb4e9c215b8f0f8954818691549f8a34135be
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1251_main.c b/trunk/drivers/net/wireless/wl12xx/wl1251_main.c
index 563c84fc575c..63511ca131b1 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1251_main.c
@@ -1388,6 +1388,8 @@ int wl1251_init_ieee80211(struct wl1251 *wl)
 	wl->hw->wiphy->max_scan_ssids = 1;
 	wl->hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &wl1251_band_2ghz;
 
+	wl->hw->queues = 4;
+
 	ret = wl1251_register_hw(wl);
 	if (ret)
 		goto out;
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1251_tx.h b/trunk/drivers/net/wireless/wl12xx/wl1251_tx.h
index b7bead8b0aeb..55856c6bb97a 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1251_tx.h
+++ b/trunk/drivers/net/wireless/wl12xx/wl1251_tx.h
@@ -212,9 +212,6 @@ struct tx_result {
 
 static inline int wl1251_tx_get_queue(int queue)
 {
-	/* FIXME: use best effort until WMM is enabled */
-	return QOS_AC_BE;
-
 	switch (queue) {
 	case 0:
 		return QOS_AC_VO;