[PATCH 4.4 112/342] rtlwifi: rtl8723be: Fix module parameter initialization

Path	csiph.com!goblin2!goblin.stu.neva.ru!gothmog.csi.it!bofh.it!news.nic.it!robomod
From	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Newsgroups	linux.kernel
Subject	[PATCH 4.4 112/342] rtlwifi: rtl8723be: Fix module parameter initialization
Date	Wed, 02 Mar 2016 02:20:01 +0100
Message-ID	<r83Ch-jE-13@gated-at.bofh.it> (permalink)
References	<r82mS-7Ml-9@gated-at.bofh.it>
Dkim-Signature	v=1; a=rsa-sha1; c=relaxed/relaxed; s=mandrill; d=linuxfoundation.org; h=From:Subject:To:Cc:Message-Id:In-Reply-To:References:Date:MIME-Version:Content-Type:Content-Transfer-Encoding; i=gregkh@linuxfoundation.org; bh=4LD6b9XSt5Gjze8DWPd71FhS4js=; b=B+t4fUJ5e6egqK70UCCrppBzVcDV5zoEKDnu6vhfozukjlMzrnikHGp6APhdlmVG7gJQxAYe2gX3 HLcYuktDQqhfLBBw1k+rnenz8AGBjMW3qfrnKKSg/Tit2j3tInVguX8SF9wPOTx9ipi3WAwh7f1a uZYzmlacM6mhAsFrQ5I=
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandrillapp.com; i=@mandrillapp.com; q=dns/txt; s=mandrill; t=1456876461; h=From : Subject : To : Cc : Message-Id : In-Reply-To : References : Date : MIME-Version : Content-Type : Content-Transfer-Encoding : From : Subject : Date : X-Mandrill-User : List-Unsubscribe; bh=hvR6yzd3udpqic5r+I0dyTaMNd4WlnhFseXU5tM1QJs=; b=KN07w91+Fn4qAd/p43zntUfJSVsRWgC4GjKmXhUyNHLm0JThGTQSGHMxxV1a2GZ8cjPjBV XSJHakBXBLr9YdUC8x/nOShezA0XPUoZX3SbuYRm7cGldgN7UaA1d+MItnnNQXbzl+XZ+ngm 6zwhO0lQiatWIuW9omiM7sUcq7u0I=
X-Mailer	git-send-email 2.7.2
X-Report-Abuse	Please forward a copy of this message, including all headers, to abuse@mandrill.com
X-Report-Abuse	You can also report abuse here: http://mandrillapp.com/contact/abuse?id=30481620.bd55c58d962e484aa4758f772b1b3347
X-Mandrill-User	md_30481620
MIME-Version	1.0
Content-Type	text/plain; charset=utf-8
Content-Transfer-Encoding	7bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	54
Organization	linux.* mail to news gateway
X-Original-Cc	Greg Kroah-Hartman <gregkh@linuxfoundation.org>, <stable@vger.kernel.org>, Larry Finger <Larry.Finger@lwfinger.net>, Kalle Valo <kvalo@codeaurora.org>
X-Original-Date	Tue, 01 Mar 2016 23:54:21 +0000
X-Original-Message-ID	<20160301234531.585598142@linuxfoundation.org>
X-Original-References	<20160301234527.990448862@linuxfoundation.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1347426

Show key headers only | View raw

4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Larry Finger <Larry.Finger@lwfinger.net>

commit 7079604ddb83f428359feace3aeaf8a9f435be4a upstream.

This driver has a number of errors in the module initialization. These
include the following:

Parameter msi_support is stored in two places - one is removed.
Paramters sw_crypto and disable_watchdog were never stored in the final
locations, nor were they initialized properly.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
@@ -93,7 +93,6 @@ int rtl8723be_init_sw_vars(struct ieee80
 	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
 
 	rtl8723be_bt_reg_init(hw);
-	rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
 	rtlpriv->btcoexist.btc_ops = rtl_btc_get_ops_pointer();
 
 	rtlpriv->dm.dm_initialgain_enable = 1;
@@ -151,6 +150,10 @@ int rtl8723be_init_sw_vars(struct ieee80
 	rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
 	rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
 	rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
+	rtlpriv->cfg->mod_params->sw_crypto =
+		 rtlpriv->cfg->mod_params->sw_crypto;
+	rtlpriv->cfg->mod_params->disable_watchdog =
+		 rtlpriv->cfg->mod_params->disable_watchdog;
 	if (rtlpriv->cfg->mod_params->disable_watchdog)
 		pr_info("watchdog disabled\n");
 	rtlpriv->psc.reg_fwctrl_lps = 3;
@@ -267,6 +270,9 @@ static struct rtl_mod_params rtl8723be_m
 	.inactiveps = true,
 	.swctrl_lps = false,
 	.fwctrl_lps = true,
+	.msi_support = false,
+	.disable_watchdog = false,
+	.debug = DBG_EMERG,
 };
 
 static struct rtl_hal_cfg rtl8723be_hal_cfg = {

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 4.4 112/342] rtlwifi: rtl8723be: Fix module parameter initialization Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-03-02 02:20 +0100

csiph-web