From patchwork Sat Mar 7 02:37:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Eric W. Biederman" X-Patchwork-Id: 5958361 X-Patchwork-Delegate: kvalo@adurom.com 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 148CABF440 for ; Sat, 7 Mar 2015 02:40:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 13F4020361 for ; Sat, 7 Mar 2015 02:40:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3896F202F2 for ; Sat, 7 Mar 2015 02:40:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754011AbbCGCkm (ORCPT ); Fri, 6 Mar 2015 21:40:42 -0500 Received: from out02.mta.xmission.com ([166.70.13.232]:36711 "EHLO out02.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753594AbbCGCkk convert rfc822-to-8bit (ORCPT ); Fri, 6 Mar 2015 21:40:40 -0500 Received: from in02.mta.xmission.com ([166.70.13.52]) by out02.mta.xmission.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1YU4fP-0007GW-IY; Fri, 06 Mar 2015 19:40:39 -0700 Received: from 70-59-163-10.omah.qwest.net ([70.59.163.10] helo=x220.int.ebiederm.org.xmission.com) by in02.mta.xmission.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1YU4fP-0007J2-21; Fri, 06 Mar 2015 19:40:39 -0700 From: ebiederm@xmission.com (Eric W. Biederman) To: Kalle Valo Cc: David Miller , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Emmanuel Grumbach References: <874mpy2gw5.fsf@kamboji.qca.qualcomm.com> <87fv9h7cwl.fsf@x220.int.ebiederm.org> Date: Fri, 06 Mar 2015 20:37:03 -0600 In-Reply-To: <87fv9h7cwl.fsf@x220.int.ebiederm.org> (Eric W. Biederman's message of "Fri, 06 Mar 2015 20:35:22 -0600") Message-ID: <8761ad7cts.fsf_-_@x220.int.ebiederm.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-XM-AID: U2FsdGVkX18XYpgWrm0Aiuit0Q+0xAFRGO7EkA5+UHU= X-SA-Exim-Connect-IP: 70.59.163.10 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-DCC: XMission; sa05 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ;Kalle Valo X-Spam-Relay-Country: X-Spam-Timing: total 183 ms - load_scoreonly_sql: 0.05 (0.0%), signal_user_changed: 4.5 (2.5%), b_tie_ro: 3.2 (1.8%), parse: 1.22 (0.7%), extract_message_metadata: 15 (8.3%), get_uri_detail_list: 2.1 (1.2%), tests_pri_-1000: 6 (3.4%), tests_pri_-950: 1.03 (0.6%), tests_pri_-900: 0.82 (0.4%), tests_pri_-400: 17 (9.2%), check_bayes: 16 (8.6%), b_tokenize: 4.1 (2.2%), b_tok_get_all: 4.9 (2.7%), b_comp_prob: 1.87 (1.0%), b_tok_touch_all: 2.8 (1.6%), b_finish: 0.79 (0.4%), tests_pri_0: 127 (69.4%), tests_pri_500: 7 (3.9%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH net-next 2/2] iwlwifi: mvm: Fix the build of mvm/phy-ctxt.c with debugfs disabled X-SA-Exim-Version: 4.2.1 (built Wed, 24 Sep 2014 11:00:52 -0600) X-SA-Exim-Scanned: Yes (on in02.mta.xmission.com) 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 When attempting to build my kernel I get: CC drivers/net/wireless/iwlwifi/mvm/phy-ctxt.o drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c: In function ‘iwl_mvm_phy_ctxt_cmd_data’: drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c:178:6: error: ‘struct iwl_mvm’ has no member named ‘dbgfs_rx_phyinfo’ drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c:179:23: error: ‘struct iwl_mvm’ has no member named ‘dbgfs_rx_phyinfo’ make[6]: *** [drivers/net/wireless/iwlwifi/mvm/phy-ctxt.o] Error 1 Fix it by making the new code depend on debugfs. Fixes: ddf89ab10a93e8b iwlwifi: mvm: allow to force the Rx chains from debugfs Cc: Emmanuel Grumbach Signed-off-by: "Eric W. Biederman" --- drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c index 1bd10eda01f9..192b74bc8cf6 100644 --- a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c +++ b/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c @@ -175,8 +175,10 @@ static void iwl_mvm_phy_ctxt_cmd_data(struct iwl_mvm *mvm, cmd->rxchain_info |= cpu_to_le32(idle_cnt << PHY_RX_CHAIN_CNT_POS); cmd->rxchain_info |= cpu_to_le32(active_cnt << PHY_RX_CHAIN_MIMO_CNT_POS); +#ifdef CONFIG_IWLWIFI_DEBUGFS if (unlikely(mvm->dbgfs_rx_phyinfo)) cmd->rxchain_info = cpu_to_le32(mvm->dbgfs_rx_phyinfo); +#endif cmd->txchain_info = cpu_to_le32(iwl_mvm_get_valid_tx_ant(mvm)); }