From: Kalle Valo <kalle.valo@iki.fi>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH v2 11/11] wl1251: enable WMM
Date: Mon, 30 Nov 2009 10:18:47 +0200 [thread overview]
Message-ID: <20091130081847.17360.19479.stgit@tikku> (raw)
In-Reply-To: <20091130081706.17360.48084.stgit@tikku>
From: Kalle Valo <kalle.valo@nokia.com>
Everything is ready now and we can enable WMM in mac80211.
Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
---
drivers/net/wireless/wl12xx/wl1251_main.c | 2 ++
drivers/net/wireless/wl12xx/wl1251_tx.h | 3 ---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
index 563c84f..63511ca 100644
--- a/drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/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/drivers/net/wireless/wl12xx/wl1251_tx.h b/drivers/net/wireless/wl12xx/wl1251_tx.h
index b7bead8..55856c6 100644
--- a/drivers/net/wireless/wl12xx/wl1251_tx.h
+++ b/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;
prev parent reply other threads:[~2009-11-30 8:20 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-30 8:17 [PATCH v2 00/11] wl1251 WMM support and minor fixes Kalle Valo
2009-11-30 8:17 ` [PATCH v2 01/11] wl1251: add tx queue status to debugfs Kalle Valo
2009-11-30 8:17 ` [PATCH v2 02/11] wl1251: print a debug message when tx_queue is full Kalle Valo
2009-11-30 8:17 ` [PATCH v2 03/11] wl1251: fix error handling in wl1251_op_config() Kalle Valo
2009-11-30 8:17 ` [PATCH v2 04/11] wl1251: reduce ELP wakeup timeout Kalle Valo
2009-11-30 8:18 ` [PATCH v2 05/11] wl1251: simplify ELP wakeup time calculation Kalle Valo
2009-11-30 8:18 ` [PATCH v2 06/11] wl1251: use __dev_alloc_skb() on RX Kalle Valo
2009-11-30 8:18 ` [PATCH v2 07/11] wl1251: implement acx_ac_cfg to configure hardware queues Kalle Valo
2009-11-30 8:18 ` [PATCH v2 08/11] wl1251: implement wl1251_acx_tid_cfg() Kalle Valo
2009-11-30 8:18 ` [PATCH v2 09/11] wl1251: implement WMM Kalle Valo
2009-11-30 8:18 ` [PATCH v2 10/11] wl1251: update tx_hdr when aliging skb in tx Kalle Valo
2009-11-30 8:18 ` Kalle Valo [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091130081847.17360.19479.stgit@tikku \
--to=kalle.valo@iki.fi \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox