From: Sujith Manoharan Date: Wed, 1 May 2013 12:02:56 +0530 Subject: [ath9k-devel] [PATCH v2 3/5] ath10k: Fix TXOP handling In-Reply-To: <1367389978-25698-1-git-send-email-sujith@msujith.org> References: <1367389978-25698-1-git-send-email-sujith@msujith.org> Message-ID: <1367389978-25698-4-git-send-email-sujith@msujith.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ath9k-devel@lists.ath9k.org From: Sujith Manoharan The channel time duration programmed in the HW is in absolute microseconds, while mac80211 gives the txop in units of 32 microseconds. Handle this properly. Signed-off-by: Sujith Manoharan --- drivers/net/wireless/ath/ath10k/mac.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 93fe03f..d280463 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -2221,7 +2221,14 @@ static int ath10k_conf_tx(struct ieee80211_hw *hw, p->cwmin = params->cw_min; p->cwmax = params->cw_max; p->aifs = params->aifs; - p->txop = params->txop; + + /* + * The channel time duration programmed in the HW is in absolute + * microseconds, while mac80211 gives the txop in units of + * 32 microseconds. + */ + p->txop = params->txop * 32; + /* FIXME: can we pass the params->uapsd to the FW? */ /* FIXME: FW accepts wmm params per hw, not per vif */ -- 1.8.2.2