From patchwork Fri Dec 12 11:41:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 5481881 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C73B0BEEA8 for ; Fri, 12 Dec 2014 11:55:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E4E312014A for ; Fri, 12 Dec 2014 11:55:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 18F7C2013A for ; Fri, 12 Dec 2014 11:55:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967374AbaLLLye (ORCPT ); Fri, 12 Dec 2014 06:54:34 -0500 Received: from mail-wg0-f41.google.com ([74.125.82.41]:50601 "EHLO mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967013AbaLLLyc (ORCPT ); Fri, 12 Dec 2014 06:54:32 -0500 Received: by mail-wg0-f41.google.com with SMTP id y19so8877200wgg.14 for ; Fri, 12 Dec 2014 03:54:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2FyAIZuKekQv+fGFapuZQYtIhKQTSP6tmlEE9LHI+yo=; b=4TrceNPIpiD45DlV9ZAwgZqPGkCNiDEXBxPNhDgRBXIQWNDeOZiuBb+u593qWXNOZv hCZ9593ezAXvR4ebHicJrmSutxyin1jSoPCskt5xhDdj7cg0oT+jXeqCrtISES2XAMVf d7JxJyb2qHGiJF9amSvBCzC6wf7lJ9+fbvn4s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2FyAIZuKekQv+fGFapuZQYtIhKQTSP6tmlEE9LHI+yo=; b=ImzlOx8XHI0R1muUNAr5HeNKgV7mSYh4ClzOAIpmu+GnGID/I1TyHwhcLnQifFygXB 6dYITFt8bbXz2hBAS05ZikIblrt/HrahNr26x8UlPbsSu8bsCoBXxZbzro4nGUl0UNjY HX2ygc1oJwOpJUF5xy/9pMf7Q/ICr1F2DpmZLMHt8gzxmBnjHOdiGtAo3GchNgSiSKFA H04qymRMzLr04dM+aH3xHrsdxmhmQB8j07BOIwKwmYL0N3MHKdTxTRoc/KQpZ0dWbEmc GsCU+TggUXuFf8iIgfr5ZtFV/JrRkyt+tuYu70ppCjzUrh7Zeroo4lW9hWxsCsOZ3KFQ BGzw== X-Gm-Message-State: ALoCoQmzJnmJd5Lbpx+6YGQKoWMnWHPXKQkEvurZ7W69DxFMbzskpfQJitqKL1ZctrRSr5fKSNTPCMRH96zP8rEca1172zjbuG9lx6Xgto3qmX40gcky4EPQJLjcUhlIs3vpC8YYCWgh X-Received: by 10.180.85.34 with SMTP id e2mr7189202wiz.0.1418385270534; Fri, 12 Dec 2014 03:54:30 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id pf4sm1516796wjb.36.2014.12.12.03.54.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Dec 2014 03:54:30 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH v2 1/5] ath10k: improve 11b coex Date: Fri, 12 Dec 2014 12:41:35 +0100 Message-Id: <1418384499-31660-2-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1418384499-31660-1-git-send-email-michal.kazior@tieto.com> References: <1418214714-29689-1-git-send-email-michal.kazior@tieto.com> <1418384499-31660-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some firmware revisions need peer phymode to be specified as MODE_11B when associating as station to a 11b AP. Otherwise they can starve other stations. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index fe61201..950322d 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -1416,6 +1416,12 @@ static void ath10k_peer_assoc_h_qos(struct ath10k *ar, } } +static bool ath10k_mac_sta_has_11g_rates(struct ieee80211_sta *sta) +{ + /* First 4 rates in ath10k_rates are CCK (11b) rates. */ + return sta->supp_rates[IEEE80211_BAND_2GHZ] >> 4; +} + static void ath10k_peer_assoc_h_phymode(struct ath10k *ar, struct ieee80211_vif *vif, struct ieee80211_sta *sta, @@ -1430,8 +1436,10 @@ static void ath10k_peer_assoc_h_phymode(struct ath10k *ar, phymode = MODE_11NG_HT40; else phymode = MODE_11NG_HT20; - } else { + } else if (ath10k_mac_sta_has_11g_rates(sta)) { phymode = MODE_11G; + } else { + phymode = MODE_11B; } break; @@ -4724,6 +4732,9 @@ static const struct ieee80211_channel ath10k_5ghz_channels[] = { CHAN5G(165, 5825, 0), }; +/* Note: Be careful if you re-order these. There is code which depends on this + * ordering. + */ static struct ieee80211_rate ath10k_rates[] = { /* CCK */ RATETAB_ENT(10, 0x82, 0),