From nbd@nbd.name Sun Feb 5 15:15:46 2012 Return-path: Envelope-to: linville@tuxdriver.com Delivery-date: Sun, 05 Feb 2012 15:15:46 -0500 Received: from [2a01:4f8:131:30e2::2] (helo=nbd.name) by smtp.tuxdriver.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1Ru8Um-0004mE-I0 for linville@tuxdriver.com; Sun, 05 Feb 2012 15:15:44 -0500 Received: by nf.local (Postfix, from userid 501) id 1926D5BDE1DD; Sun, 5 Feb 2012 21:15:18 +0100 (CET) From: Felix Fietkau To: linux-wireless@vger.kernel.org Cc: linville@tuxdriver.com, mcgrof@qca.qualcomm.com, mohammed@qca.qualcomm.com Subject: [PATCH 3.3 2/2] ath9k_hw: fix a RTS/CTS timeout regression Date: Sun, 5 Feb 2012 21:15:18 +0100 Message-Id: <1328472918-30012-2-git-send-email-nbd@openwrt.org> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1328472918-30012-1-git-send-email-nbd@openwrt.org> References: <1328472918-30012-1-git-send-email-nbd@openwrt.org> X-Spam-Score: -1.1 (-) X-Spam-Status: No Status: RO Content-Length: 1749 Lines: 45 commit adb5066 "ath9k_hw: do not apply the 2.4 ghz ack timeout workaround to cts" reduced the hardware CTS timeout to the normal values specified by the standard, but it turns out while it doesn't need the same extra time that it needs for the ACK timeout, it does need more than the value specified in the standard, but only for 2.4 GHz. This patch brings the CTS timeout value in sync with the initialization values, while still allowing adjustment for bigger distances. Signed-off-by: Felix Fietkau Cc: stable@vger.kernel.org Reported-by: Seth Forshee Reported-by: Marek Lindner --- drivers/net/wireless/ath/ath9k/hw.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index ee77595..87db1ee 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -1037,13 +1037,16 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah) /* * Workaround for early ACK timeouts, add an offset to match the - * initval's 64us ack timeout value. + * initval's 64us ack timeout value. Use 48us for the CTS timeout. * This was initially only meant to work around an issue with delayed * BA frames in some implementations, but it has been found to fix ACK * timeout issues in other cases as well. */ - if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ) + if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ) { acktimeout += 64 - sifstime - ah->slottime; + ctstimeout += 48 - sifstime - ah->slottime; + } + ath9k_hw_set_sifs_time(ah, sifstime); ath9k_hw_setslottime(ah, slottime); -- 1.7.3.2