From patchwork Wed Jun 21 17:15:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9802341 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 7710E60329 for ; Wed, 21 Jun 2017 17:15:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BF4E285E8 for ; Wed, 21 Jun 2017 17:15:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 50C1228610; Wed, 21 Jun 2017 17:15:57 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, URIBL_BLACK 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 EEB84285E8 for ; Wed, 21 Jun 2017 17:15:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752831AbdFURPx (ORCPT ); Wed, 21 Jun 2017 13:15:53 -0400 Received: from mail-ot0-f195.google.com ([74.125.82.195]:34468 "EHLO mail-ot0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752265AbdFURPw (ORCPT ); Wed, 21 Jun 2017 13:15:52 -0400 Received: by mail-ot0-f195.google.com with SMTP id p48so20324427otc.1 for ; Wed, 21 Jun 2017 10:15:52 -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=/bHFxBAMDPAtKzcFnrWGyjUMy+XXt5tdq7PhSXSzbv4=; b=a/rS/jxf3gZ9tfMkDsIzHxXltKouXBXMRiRUQd/CRJuRKRSoj2Tta5mBuY+Q7cBc+O nfq6NWA9NRkrPYeT6cw2SDYoXbmbQ0KttRCtYBl7O2iELpnv9DgHcnIdoMsY+0g3FtuV U8g8xf4Pa4u+rDpWsSd+WliuyUJ+s2D+q+bIuY4xkLyPGXhcuojtPktOqR/WggO1ITCV hbfF3Rn2EL8FqlqPMa72CXdZSrqyFxevJ38AzEqaWymHkQh2AU+k5H802v6qy2vbgc3u pVzbaXH45r+w1iqGRL6NvjLerEbx8RIGjx+99hdqoatQDsaP2DoB6S3LoTjkIC44M7SG y+iA== 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=/bHFxBAMDPAtKzcFnrWGyjUMy+XXt5tdq7PhSXSzbv4=; b=q7YHx9zOVRK0AzDmfKIGg8LRM2w1oXjHJDTjYwTduhNvxk67hzTbnDwleZAtebLzGD VYgK4mIRsew9Zp3/b/3Hg0iF9CPnPCerVUIzZUulJdSAmpyP7hcceGYilpEzdyIfAH3w G+D8XAiPg+7K6+JTroVVX+gIe12mU968XBoVHpUrLwSyRFhwqLAxbhEEIyE4Dla8At8d PkETPW3KaPhHmANssB6Za9WO5xrdhPxmCk0NjwMiPoGkIm6n/VwznERVV2MI8sWaio1h kN11lkMquxdbSPmBiQaHFdnExWQLpe9Pwqr+E3DciCO4cUkOLm5kulxf9aUa0wgICUOr r1UQ== X-Gm-Message-State: AKS2vOyDJ/SFrOTGhMBdnAHsNyfDnLG6+QcIWFM/2jVojAIs8gqHAogW /ZeCO76CPZ4pflIz X-Received: by 10.157.46.65 with SMTP id c1mr11836791otd.190.1498065351719; Wed, 21 Jun 2017 10:15:51 -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 i38sm6785237ota.3.2017.06.21.10.15.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Jun 2017 10:15:51 -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 v2 8/8] rtlwifi: Add in_4way field for btcoexist Date: Wed, 21 Jun 2017 12:15:38 -0500 Message-Id: <20170621171538.4462-9-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170621171538.4462-1-Larry.Finger@lwfinger.net> References: <20170621171538.4462-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 If wifi is in 4way, btcoex give wifi higher priority to use antenna. 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/halbtcoutsrc.c | 3 +-- drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c index 9dbb35f190d1..e6024b013ca5 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c @@ -428,8 +428,7 @@ static bool halbtc_get(void *void_btcoexist, u8 get_type, void *out_buf) *bool_tmp = false; break; case BTC_GET_BL_WIFI_4_WAY_PROGRESS: - /* TODO */ - *bool_tmp = false; + *bool_tmp = rtlpriv->btcoexist.btc_info.in_4way; break; case BTC_GET_BL_WIFI_UNDER_5G: if (rtlhal->current_bandtype == BAND_ON_5G) diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h index 98183dc707aa..fb1ebb01133f 100644 --- a/drivers/net/wireless/realtek/rtlwifi/wifi.h +++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h @@ -2484,6 +2484,7 @@ struct rtl_btc_info { u8 single_ant_path; u8 ap_num; + bool in_4way; }; struct bt_coexist_info {