[PATCH 4.4 111/342] rtlwifi: rtl8188ee: Fix module parameter initialization

Path	csiph.com!news.mixmin.net!weretis.net!feeder4.news.weretis.net!newsfeed.CARNet.hr!news.spin.it!bofh.it!news.nic.it!robomod
From	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Newsgroups	linux.kernel
Subject	[PATCH 4.4 111/342] rtlwifi: rtl8188ee: Fix module parameter initialization
Date	Wed, 02 Mar 2016 02:20:01 +0100
Message-ID	<r83Ch-jE-3@gated-at.bofh.it> (permalink)
References	<r82mS-7Ml-9@gated-at.bofh.it>
X-Original-To	<linux-kernel@vger.kernel.org>
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=lrY7VEmbqIBibPhm4sMeEM5fFic=; b=YzIO0Kd6Mmdnr89BrnNxUYSFFn2vr4MEEn0FiC87oOyxtdzRxoFpPavNyAxVhxTazjr3CM3alhtm 9B/prQd/cMFqB67pWdisPz8lcrCRmzYjbLuvlthhlAS8rdI2daD1Mopeo6SvuXZlGGs8y2I9d0AR DdZpsj/JHt/qZbR1q+A=
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandrillapp.com; i=@mandrillapp.com; q=dns/txt; s=mandrill; t=1456876460; 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=HP2MoXdE4Qe6CdojRbprhEmY3TmKFNiIPRGqjvgzRxc=; b=H7UfDE9EXQhpSLMZ+3BflL1HWy8BN0kTtG61lX44Z8qTs4Y9xw5YyJjkgdWnWCYMzq2WjY j5vV+oR25+uklSOyYXwXbPwOi04WRXDgvyW1NWkvTUGQpZb4wHRRivaWCJ65zVaYFqqxVu0W s46JXc4D5IFNBz7ZaLmlw/+tmnbJo=
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.a6ca21e56754478b8b21817456ef13d0
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	44
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:20 +0000
X-Original-Message-ID	<20160301234531.551804385@linuxfoundation.org>
X-Original-References	<20160301234527.990448862@linuxfoundation.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1347421

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 06f34572c6110e2e2d5e653a957f1d74db9e3f2b upstream.

In this driver, parameters disable_watchdog and sw_crypto are never
copied into the locations used in the main code. While modifying the
parameter handling, the copying of parameter msi_support is moved to
be with the rest.

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/rtl8188ee/sw.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
@@ -88,8 +88,6 @@ int rtl88e_init_sw_vars(struct ieee80211
 	u8 tid;
 
 	rtl8188ee_bt_reg_init(hw);
-	rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
-
 	rtlpriv->dm.dm_initialgain_enable = 1;
 	rtlpriv->dm.dm_flag = 0;
 	rtlpriv->dm.disable_framebursting = 0;
@@ -138,6 +136,11 @@ int rtl88e_init_sw_vars(struct ieee80211
 	rtlpriv->psc.inactiveps = rtlpriv->cfg->mod_params->inactiveps;
 	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");
 	if (!rtlpriv->psc.inactiveps)

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

Thread

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

csiph-web