From patchwork Fri Jun 17 09:58:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 9183173 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1E79760832 for ; Fri, 17 Jun 2016 09:58:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10EB328385 for ; Fri, 17 Jun 2016 09:58:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 05B3428399; Fri, 17 Jun 2016 09:58:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=2.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED, FSL_HELO_HOME, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 26AA928385 for ; Fri, 17 Jun 2016 09:58:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755287AbcFQJ6h (ORCPT ); Fri, 17 Jun 2016 05:58:37 -0400 Received: from narfation.org ([79.140.41.39]:33621 "EHLO v3-1039.vlinux.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753362AbcFQJ6g (ORCPT ); Fri, 17 Jun 2016 05:58:36 -0400 Received: from sven-desktop.home.narfation.org (p2003007C6F7DD1FE04A0165FC0023ED9.dip0.t-ipconnect.de [IPv6:2003:7c:6f7d:d1fe:4a0:165f:c002:3ed9]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id BA86F11000C; Fri, 17 Jun 2016 11:58:33 +0200 (CEST) Authentication-Results: v3-1039.vlinux.de; dmarc=none header.from=narfation.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1466157513; bh=FaZYzp8SrT5GObbCMxamUMKIRIw5q4bhb+8smZTNVxM=; h=From:To:Cc:Subject:Date:From; b=0PHMa1peGamxSGHCZ3SJxp6+Ah1B0C2t6Y0Ubfvtizyg4tJLRk77458U3ZYWLbyL2 HMBpKbgOQ+42fq1hGAEY1hFxNShfalDJlIx6IBHTEkq2X0zINUV92pYksQGxrdhg8/ yXuDwfEPKXj5EETuWg8hVqgQeg2j3EZM6Gy+9cG4= From: Sven Eckelmann To: ath9k-devel@lists.ath9k.org Cc: linux-wireless@vger.kernel.org, ath9k-devel@qca.qualcomm.com, Sven Eckelmann , Simon Wunderlich , Sujith Manoharan Subject: [PATCH] ath9k: Fix programming of minCCA power threshold Date: Fri, 17 Jun 2016 11:58:20 +0200 Message-Id: <1466157500-30791-1-git-send-email-sven@narfation.org> 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-Virus-Scanned: ClamAV using ClamSMTP The function ar9003_hw_apply_minccapwr_thresh takes as second parameter not a pointer to the channel but a boolean value describing whether the channel is 2.4GHz or not. This broke (according to the origin commit) the ETSI regulatory compliance on 5GHz channels. Fixes: 3533bf6b15a0 ("ath9k: Fix regulatory compliance") Signed-off-by: Sven Eckelmann Cc: Simon Wunderlich Cc: Sujith Manoharan --- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c index dec1a31..e2083f4 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c @@ -4176,7 +4176,7 @@ static void ath9k_hw_ar9300_set_board_values(struct ath_hw *ah, if (!AR_SREV_9330(ah) && !AR_SREV_9340(ah) && !AR_SREV_9531(ah)) ar9003_hw_internal_regulator_apply(ah); ar9003_hw_apply_tuning_caps(ah); - ar9003_hw_apply_minccapwr_thresh(ah, chan); + ar9003_hw_apply_minccapwr_thresh(ah, is2ghz); ar9003_hw_txend_to_xpa_off_apply(ah, is2ghz); ar9003_hw_thermometer_apply(ah); ar9003_hw_thermo_cal_apply(ah);