From patchwork Mon Jul 17 14:34:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9845333 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 6577D6037F for ; Mon, 17 Jul 2017 14:34:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5254227E63 for ; Mon, 17 Jul 2017 14:34:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 47169284FF; Mon, 17 Jul 2017 14:34:31 +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 2C1B927E63 for ; Mon, 17 Jul 2017 14:34:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751346AbdGQOe1 (ORCPT ); Mon, 17 Jul 2017 10:34:27 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:34563 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751300AbdGQOe0 (ORCPT ); Mon, 17 Jul 2017 10:34:26 -0400 Received: by mail-oi0-f66.google.com with SMTP id d77so18024428oig.1 for ; Mon, 17 Jul 2017 07:34:26 -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; bh=dz3i46XEWmUbbpjHr4S3nZ6pGPQI6wQ6TL3ET9dkBa4=; b=bkvJaG0V7I3gUd0aMaUlhhwcnOdRJ9on3+wHiR+jEcBDLbGcHQ8LokqetMFQT52QLN uhxf834eKg4T/xvAJc5UN+KTF7KHF7a6Aak4UmEJYUgWdD4ZpyFD5DZFeQETmwiIWYx8 p3ght07d5zPjUtcxAlCv9rW8bQEfvGwRXqe4wfsktPIWeZfF/yf21JAAZBOPALG6ic5n FIppefrIABlaOMG5SGgc/NuH74djYPQQNATgpjcYd8kv58y0tn7k1SoXVSUOMmd5/rpU jY9ootjZU5ELImo2SbE7u9SrPyIr7h/Q/VKOyKjfF0AQwseWcbdwgO0ZObZnWwH5f8OK iWfA== 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; bh=dz3i46XEWmUbbpjHr4S3nZ6pGPQI6wQ6TL3ET9dkBa4=; b=TOmehlA9S7Py5zXMQMeLWYwqR9JHE/qVtIoNVzcWCFegz6h+gMJu4Zmw7U2wMF/0Lj hFGxeotLT1VnvA9s7P/66zDNJOCzBWzfRWPduPBBWEhCWS6xra+uPkoF4mGc33A7fDXl 2Yxy0dBdJTyQKCQhGcOQ9E/MrGiaVKrWK0Ankpr8Ik+5i2AXNC1aBH1osx7pTcDeaL14 6Vh4U3Dn+0CyEUs2lFnIIvwTpIHhZo47KWbV8qM/IBXoTkQNz5wuW1WcywbP3Xg4pWaX CXCVrzDaSyehexZwpqboZYTUjsO4bbxCK0O2BEW1GGIsyGV3Do6bHlMayQX5V6EYl1sG Hh9A== X-Gm-Message-State: AIVw113KgcgFi7Bj4/0LCkfdOan7BWs4oMSOMe9Bdbn+dZaa1K2iusX/ xXVZ9k5q3NOfdA== X-Received: by 10.202.166.28 with SMTP id p28mr5316701oie.150.1500302066458; Mon, 17 Jul 2017 07:34:26 -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 b186sm5382465oih.29.2017.07.17.07.34.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Jul 2017 07:34:25 -0700 (PDT) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, Larry Finger , Ping-Ke Shih , Yan-Hsuan Chuang , Birming Chiu , Shaofu , Steven Ting Subject: [PATCH] Revert "rtlwifi: btcoex: rtl8723be: fix ant_sel not work" Date: Mon, 17 Jul 2017 09:34:19 -0500 Message-Id: <20170717143419.12865-1-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.12.3 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 This reverts commit f95d95a7cd5514549dcf6ba754f0ee834cce3e1f. With commit f95d95a7cd55 ("rtlwifi: btcoex: rtl8723be: fix ant_sel not work"), the kernel has a NULL pointer dereference oops. This content and the proper fix will be included in a later patch. Fixes: f95d95a7cd55 ("rtlwifi: btcoex: rtl8723be: fix ant_sel not work") Signed-off-by: Larry Finger Cc: Ping-Ke Shih Cc: Yan-Hsuan Chuang Cc: Birming Chiu Cc: Shaofu Cc: Steven Ting --- Kalle, This patch needs to be applied to kernel 4.13. Sorry that it slipped through. Larry --- drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 3 --- drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 - 2 files changed, 4 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c index 2a7ad5ffe997..cd5dc6dcb19f 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c @@ -846,9 +846,6 @@ static bool _rtl8723be_init_mac(struct ieee80211_hw *hw) return false; } - if (rtlpriv->cfg->ops->get_btc_status()) - rtlpriv->btcoexist.btc_ops->btc_power_on_setting(rtlpriv); - bytetmp = rtl_read_byte(rtlpriv, REG_MULTI_FUNC_CTRL); rtl_write_byte(rtlpriv, REG_MULTI_FUNC_CTRL, bytetmp | BIT(3)); diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h index fb1ebb01133f..70723e67b7d7 100644 --- a/drivers/net/wireless/realtek/rtlwifi/wifi.h +++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h @@ -2547,7 +2547,6 @@ struct bt_coexist_info { struct rtl_btc_ops { void (*btc_init_variables) (struct rtl_priv *rtlpriv); void (*btc_init_hal_vars) (struct rtl_priv *rtlpriv); - void (*btc_power_on_setting)(struct rtl_priv *rtlpriv); void (*btc_init_hw_config) (struct rtl_priv *rtlpriv); void (*btc_ips_notify) (struct rtl_priv *rtlpriv, u8 type); void (*btc_lps_notify)(struct rtl_priv *rtlpriv, u8 type);