Return-path: Received: from mail.net.t-labs.tu-berlin.de ([130.149.220.252]:42213 "EHLO mail.net.t-labs.tu-berlin.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762080Ab3DJXZH (ORCPT ); Wed, 10 Apr 2013 19:25:07 -0400 Message-ID: <5165F4D0.8090605@net.t-labs.tu-berlin.de> (sfid-20130411_012511_837327_272A066F) Date: Thu, 11 Apr 2013 01:25:04 +0200 From: Tobias Steinicke MIME-Version: 1.0 To: ath9k-devel@lists.ath9k.org, linux-wireless@vger.kernel.org Subject: [RFCv2] ath9k: Respect current txpower setting Content-Type: text/plain; charset=ISO-8859-15 Sender: linux-wireless-owner@vger.kernel.org List-ID: In routine ath_tx_fill_desc(), the txpower is only set to MAX_RATE_POWER. Now it respects the txpower from bss_conf and set it if it is (txpower * 2) < MAX_RATE_POWER else set to MAX_RATE_POWER. Signed-off-by: Tobias Steinicke --- drivers/net/wireless/ath/ath9k/xmit.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 5bc5802..90701e4 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -1110,13 +1110,18 @@ static void ath_tx_fill_desc(struct ath_softc *sc, struct ath_buf *bf, struct ath_buf *bf_first = bf; struct ath_tx_info info; bool aggr = !!(bf->bf_state.bf_type & BUF_AGGR); + u8 txpower = tx_info->control.vif->bss_conf.txpower * 2; memset(&info, 0, sizeof(info)); info.is_first = true; info.is_last = true; - info.txpower = MAX_RATE_POWER; info.qcu = txq->axq_qnum; + if (txpower > MAX_RATE_POWER) + info.txpower = MAX_RATE_POWER; + else + info.txpower = txpower; + info.flags = ATH9K_TXDESC_INTREQ; if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK) info.flags |= ATH9K_TXDESC_NOACK; -- 1.7.9.5