From patchwork Fri Apr 29 13:06:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Schaa X-Patchwork-Id: 8981931 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4D31C9F39D for ; Fri, 29 Apr 2016 13:07:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6124F201FA for ; Fri, 29 Apr 2016 13:07:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 459E2201DD for ; Fri, 29 Apr 2016 13:07:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753515AbcD2NHw (ORCPT ); Fri, 29 Apr 2016 09:07:52 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34186 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753439AbcD2NHa (ORCPT ); Fri, 29 Apr 2016 09:07:30 -0400 Received: by mail-wm0-f65.google.com with SMTP id n129so4999920wmn.1 for ; Fri, 29 Apr 2016 06:07:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=BQRMF5RUAc5oGesm08U8iok0VNfPFlqIjUwFq7D+Rf8=; b=V9cbvO2ytXj1+U4SWJVK1zjwE8yYqxrJ9HM0K6vTY6gqRk4h6klvTfKUH11xMlfEEm rK7lGLypt4lAyHMg0/IudtYbo7RFFwuY7lZQa7dVnW53CTg31kQDnykcANnltF+lGUzg FG89eUeQMx3PaPzC9C8wQNUlwGiFWaPbVTz/d6iz5TpAq4GrsqzMYJyi0+7RPnJ8i7VT q5fRy1CN5S6Y6kg/s7cfOj/VYuVut7pLnqnjbsBVJpqfrQykv+Rl6YGU8b5lvSm/gN7g 4jxuujhyR+jeA2hMwizdmLhbpXUbwHUhJcfKjWayZpeGZ7RLMvd/US++NIvOiG7qbzIa /fJg== 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; bh=BQRMF5RUAc5oGesm08U8iok0VNfPFlqIjUwFq7D+Rf8=; b=X3dF6da0FGHQtTK1ySgm6+cudT7E4trYNhCvhd9WelV3CCjuGG9CAyotmx/9BltTjz 32U1oJ7o0ViEC3A9+wvp3nwS67iGccH9lKaBOIMaSWJQRdk9xfmNKvPHesaEaJc09X2T DoHzUM82/j7W7J87vvXi4Oo2Li48+JpohmEXO1QOA1o905h1VCDzpoOxhp+aV7saHGnl MFwmhdDqSl4kb4nAsua7qlZqoQGoBwZi1/fYAJ0lkx+PnKsQo+tBPBaKUgDhkx2M4uJ6 kvr+i8m1GHeSqc0q0pKb6UZXGMZTLPCoAQoRoT5jkXNZ9QxvWXhmKkmSRX/pu+4a8wmq jVEw== X-Gm-Message-State: AOPr4FXCbuuvBO82zE5+ZPpQRmcYMcdUKOhI0nvNEdwYd8wHUrAtE8xkmfnerGWn8UX3Ng== X-Received: by 10.194.123.65 with SMTP id ly1mr22093132wjb.125.1461935244488; Fri, 29 Apr 2016 06:07:24 -0700 (PDT) Received: from hschaa-desktop.site ([5.158.136.57]) by smtp.gmail.com with ESMTPSA id m6sm14746818wje.21.2016.04.29.06.07.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 Apr 2016 06:07:23 -0700 (PDT) From: Helmut Schaa To: linux-wireless@vger.kernel.org Cc: ath9k-devel@lists.ath9k.org, kvalo@qca.qualcomm.com, ath9k-devel@qca.qualcomm.com, Helmut Schaa , Felix Fietkau Subject: [PATCH] ath9k: Fix symbol overlap window for half/quarter channels Date: Fri, 29 Apr 2016 15:06:34 +0200 Message-Id: <1461935194-19632-1-git-send-email-helmut.schaa@googlemail.com> X-Mailer: git-send-email 2.8.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Since commit cd6cfd7311a385144a2f9c74f692ae2df3ae033f "ath9k: do not set half/quarter channel flags in AR_PHY_MODE" the condition "rfMode & (AR_PHY_MODE_QUARTER | AR_PHY_MODE_HALF)" would never evaluate to true. Fix this by using the available IS_CHAN_HALF_RATE and IS_CHAN_QUARTER_RATE marcros instead. Signed-off-by: Helmut Schaa Cc: Felix Fietkau Acked-by: Felix Fietkau --- Just stumbled over that piece of code while looking into TX99, so this is only compile-tested. Felix, can you please confirm if this is correct or if removing the whole block would be better? Thanks, Helmut drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c index 81ab3ca..ae304355 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c @@ -1010,7 +1010,7 @@ static void ar9003_hw_set_rfmode(struct ath_hw *ah, if (IS_CHAN_A_FAST_CLOCK(ah, chan)) rfMode |= (AR_PHY_MODE_DYNAMIC | AR_PHY_MODE_DYN_CCK_DISABLE); - if (rfMode & (AR_PHY_MODE_QUARTER | AR_PHY_MODE_HALF)) + if (IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan)) REG_RMW_FIELD(ah, AR_PHY_FRAME_CTL, AR_PHY_FRAME_CTL_CF_OVERLAP_WINDOW, 3);