From patchwork Fri Jan 20 21:27:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9529517 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 07A4760113 for ; Fri, 20 Jan 2017 21:30:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16990286D5 for ; Fri, 20 Jan 2017 21:30:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 093F428698; Fri, 20 Jan 2017 21:30:43 +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=-4.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 A6FCB28698 for ; Fri, 20 Jan 2017 21:30:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752266AbdATV3B (ORCPT ); Fri, 20 Jan 2017 16:29:01 -0500 Received: from mail-oi0-f68.google.com ([209.85.218.68]:34251 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752058AbdATV10 (ORCPT ); Fri, 20 Jan 2017 16:27:26 -0500 Received: by mail-oi0-f68.google.com with SMTP id w144so6503863oiw.1 for ; Fri, 20 Jan 2017 13:27:26 -0800 (PST) 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=dOICD0g3lRpwqB0+PBAwhUVPghgcpq9/j+lOhFUWW4o=; b=AimSY/jU8w49ey+rMg91rK/iKUWU8yh5JtjupGx0qX4QUEfEm1CM4fO35StUauokQK MhdxriYmP6zB3Uq8tfKAxb32fqjGgzaDOY6eXvAf5sgyqpzMBh9Stz2wPIKDLmm64+d9 PsZJAbkqSB2iWeW7hzAVgxfAsI19GNrf02X9ym2UWnim2pJFxku7f8BegQYDoTcRLomB gGGqEA0l9MKeQAWzXRN+sO0C2GEQ+UJNSbGWu9ai9vfVb3th7tr5qQSi3oE8nH+KsKoa 9++DZv47lwa4mLg2Nf9ZyMnEM2A59C1jgZ03APrsR6cz2KKaeflX/EeiI5/LVrgnDnuS AuIw== 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=dOICD0g3lRpwqB0+PBAwhUVPghgcpq9/j+lOhFUWW4o=; b=oLFfbYf3vm4zcOCKaGzrCfMF90klTTN4EjUZBr0x9VYv9BtWZRZIHTBqk47cGkJ0tH h1swoJfGoHxhOaRtpGkLz3DFmlNyoS9tTRiCB+Lqly4ZaYYcug7UArDUf0Kgf5q6OAhm 7tvlzrJ0L4lCz9aR153ImC2N+b1RIX0vKCfPzLHrcqNvEUS5d/UyFqbaCBD1rbVR7Ytx 3a6u1xFTwdbMucPsrBXBwcq6tCFAO+WMP9AbUf9D0LDcd9Civr+9S6MVsLqS7Mqg7bg0 HnamunhMhsvqv9vERnXiTojzGtc8sMa4+mNwK31dLaCkkqI/3iOrcib34gNtfqf5uGyG 4tMw== X-Gm-Message-State: AIkVDXLVSz4O2sqMN3UeC5eo9GgPu7EMTqFCQGQXstcgS6K4yVWVf5M3UMCGLmEFuxp4rQ== X-Received: by 10.202.235.215 with SMTP id j206mr8552066oih.74.1484947645904; Fri, 20 Jan 2017 13:27:25 -0800 (PST) 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 r94sm4320403ota.33.2017.01.20.13.27.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Jan 2017 13:27:25 -0800 (PST) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, Ping-Ke Shih , Larry Finger Subject: [PATCH 04/11] rtlwifi: btcoexist: Add vendor definition for new btcoexist Date: Fri, 20 Jan 2017 15:27:09 -0600 Message-Id: <20170120212716.29887-5-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170120212716.29887-1-Larry.Finger@lwfinger.net> References: <20170120212716.29887-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 Routine halbtc_get() will need to be able to get the vendor ID. Signed-off-by: Ping-Ke Shih Signed-off-by: Larry Finger --- drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 3 +++ drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c index 91cc139..8a0e773 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c @@ -335,6 +335,9 @@ static bool halbtc_get(void *void_btcoexist, u8 get_type, void *out_buf) case BTC_GET_U4_BT_PATCH_VER: *u32_tmp = halbtc_get_bt_patch_version(btcoexist); break; + case BTC_GET_U4_VENDOR: + *u32_tmp = BTC_VENDOR_OTHER; + break; case BTC_GET_U1_WIFI_DOT11_CHNL: *u8_tmp = rtlphy->current_channel; break; diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h index eb89011..f9e7c5e 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h @@ -228,6 +228,7 @@ enum btc_get_type { BTC_GET_U4_WIFI_FW_VER, BTC_GET_U4_WIFI_LINK_STATUS, BTC_GET_U4_BT_PATCH_VER, + BTC_GET_U4_VENDOR, /* type u1Byte */ BTC_GET_U1_WIFI_DOT11_CHNL, @@ -245,6 +246,12 @@ enum btc_get_type { BTC_GET_MAX }; +enum btc_vendor { + BTC_VENDOR_LENOVO, + BTC_VENDOR_ASUS, + BTC_VENDOR_OTHER +}; + enum btc_set_type { /* type bool */ BTC_SET_BL_BT_DISABLE,