From patchwork Tue May 16 13:19:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9729191 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 69DA360387 for ; Tue, 16 May 2017 13:20:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CC8B28A3B for ; Tue, 16 May 2017 13:20:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5177A28A39; Tue, 16 May 2017 13:20:25 +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=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 F144E28A26 for ; Tue, 16 May 2017 13:20:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752949AbdEPNUR (ORCPT ); Tue, 16 May 2017 09:20:17 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:35909 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753074AbdEPNUL (ORCPT ); Tue, 16 May 2017 09:20:11 -0400 Received: by mail-oi0-f68.google.com with SMTP id w138so3299796oiw.3 for ; Tue, 16 May 2017 06:20:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=VSRIT3kY18dVVjsEMvjY/Ki7J0G4GyoPhzqDVwfIDhY=; b=VTIxJuakwBkqLoxeMu/UmWkcbAO4gSrQ5snQzFbQqimqbtx/znNZWdsjEioJ4zdO8v L/QGtiFSwwpf3s13xEaAL9YSeq6jGtSCN+oqrfReHSTFRTr0Z9tiv7SxnFql3IPD/I82 uWUVtHpRB+F7XFFBgvuMmMUliZs9DSTmtC1BJPPa2NAtXr0KUbqhCZFbk3JsI9ZWk4J3 V9TmycwLcB5kK/TdxmvvMqk3z3NT3T8Gmf6tZBc53LHg+5SxMg6iOAv3LvzCdLYZvOtK aGPNJYGuAKXGhjyNgLDLSwYYfmuRB1V1zQgl5COC0uIAnTukBSpGG0EyR/1D0ajjX2g2 SNbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=VSRIT3kY18dVVjsEMvjY/Ki7J0G4GyoPhzqDVwfIDhY=; b=nOxMRvZxYRhAsp1o2dJgPGWM3KLtHk89x8ZpBkzmJgMhrYiJ4vq8kW/fpr27Xspg6Q D6GKq3DhfPKDapyt+qViXiXz2as1mRnoMr52YfXzuXKhF7y4sg6Q2tcODZpazgcSY60z 0USDjpPyPenNpmpFhvy1qzq9MCQ0KSZSeL5l8TPZApRuoeHnwzZJQ/I/y2PDCHV2y6IH VshDgWiN94spVuVtH8n+ulE1RUWAUCLTLFuNVE4wPdWzD3UT4Rgzx6iWMsTrHtrF6ErA CBJzlL1OFmwh1IH7cPvLalWIGJwmOPqvbSijojWTzrU4svhxmro4yWLOZLsYaahB59iY BSKg== X-Gm-Message-State: AODbwcAkkmrobhAtTyU20RS7KoVoM3m+pOx61c5rAeYnAz21H5yDIzvl rDS6JsQM1dHuqg== X-Received: by 10.157.22.131 with SMTP id c3mr6127570ote.120.1494940810203; Tue, 16 May 2017 06:20:10 -0700 (PDT) Received: from linux-4v1g.suse (cpe-24-31-249-175.kc.res.rr.com. [24.31.249.175]) by smtp.gmail.com with ESMTPSA id k23sm6813543ote.23.2017.05.16.06.20.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 May 2017 06:20:09 -0700 (PDT) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, Ping-Ke Shih , Larry Finger , Yan-Hsuan Chuang , Birming Chiu , Shaofu , Steven Ting Subject: [PATCH 09/10] rtlwifi: btcoex: 23b 1ant: monitor bt is enabled or disabled Date: Tue, 16 May 2017 08:19:56 -0500 Message-Id: <20170516131957.9513-10-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170516131957.9513-1-Larry.Finger@lwfinger.net> References: <20170516131957.9513-1-Larry.Finger@lwfinger.net> 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 From: Ping-Ke Shih Check BT's status, and record it in field bt_disabled. When BT is disabled, We do special action called wifi_only. Also, we move the field from 'struct btc_coexist' to 'struct coex_sta_8723b_1ant'. Signed-off-by: Ping-Ke Shih Signed-off-by: Larry Finger Cc: Yan-Hsuan Chuang Cc: Birming Chiu Cc: Shaofu Cc: Steven Ting --- drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c index 9178cccb5ddf..b07883eaec5e 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c @@ -2136,7 +2136,7 @@ void ex_halbtc8723b1ant_display_coex_info(struct btc_coexist *btcoexist) RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = [%s/ %d/ %d] ", "BT [status/ rssi/ retryCnt]", - ((btcoexist->bt_info.bt_disabled) ? ("disabled") : + ((coex_sta->bt_disabled) ? ("disabled") : ((coex_sta->c2h_bt_inquiry_page) ? ("inquiry/page scan") : ((BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE == coex_dm->bt_status) ? @@ -2422,7 +2422,7 @@ void ex_halbtc8723b1ant_connect_notify(struct btc_coexist *btcoexist, u8 type) u8 agg_buf_size = 5; if (btcoexist->manual_control || btcoexist->stop_coex_dm || - btcoexist->bt_info.bt_disabled) + coex_sta->bt_disabled) return; btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_LINK_STATUS, @@ -2472,7 +2472,7 @@ void ex_halbtc8723b1ant_media_status_notify(struct btc_coexist *btcoexist, u8 wifi_central_chnl; if (btcoexist->manual_control || btcoexist->stop_coex_dm || - btcoexist->bt_info.bt_disabled) + coex_sta->bt_disabled) return; if (BTC_MEDIA_CONNECT == type) @@ -2519,7 +2519,7 @@ void ex_halbtc8723b1ant_special_packet_notify(struct btc_coexist *btcoexist, u8 agg_buf_size = 5; if (btcoexist->manual_control || btcoexist->stop_coex_dm || - btcoexist->bt_info.bt_disabled) + coex_sta->bt_disabled) return; btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_LINK_STATUS,