From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424846AbcBRCbn (ORCPT ); Wed, 17 Feb 2016 21:31:43 -0500 Received: from mail-ob0-f173.google.com ([209.85.214.173]:35403 "EHLO mail-ob0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424277AbcBRCbl (ORCPT ); Wed, 17 Feb 2016 21:31:41 -0500 Subject: Re: [PATCH 4.4 112/117] rtlwifi: rtl8821ae: Fix errors in parameter initialization To: Luis Henriques , Ben Hutchings References: <20160214222141.393531627@linuxfoundation.org> <20160214222144.781798389@linuxfoundation.org> <1455648364.1143.12.camel@decadent.org.uk> <20160216202138.GA8671@charon.olymp> Cc: stable@vger.kernel.org, Kalle Valo , Greg Kroah-Hartman , LKML From: Larry Finger Message-ID: <56C52D0A.6050809@lwfinger.net> Date: Wed, 17 Feb 2016 20:31:38 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: <20160216202138.GA8671@charon.olymp> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/16/2016 02:21 PM, Luis Henriques wrote: > On Tue, Feb 16, 2016 at 06:46:04PM +0000, Ben Hutchings wrote: >> On Sun, 2016-02-14 at 14:22 -0800, Greg Kroah-Hartman wrote: >> >>> 4.4-stable review patch. If anyone has any objections, please let me know. >>> >>> ------------------ >>> >>> From: Larry Finger >>> >>> commit 78bae1de422a7f6f2b4b61f6a5c379e3d7f96f44 upstream. >>> >>> This driver failed to copy parameters sw_crypto and disable_watchdog into >>> the locations actually used by the driver. In addition, msi_support was >>> initialized three times and one of them used the wrong variable. The >>> initialization of parameter int_clear was moved so that it is near that >>> of the rest of the parameters. >>> >>> Signed-off-by: Larry Finger >>> Signed-off-by: Kalle Valo >>> Signed-off-by: Greg Kroah-Hartman >>> >>> --- >>> drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 9 +++++---- >>> 1 file changed, 5 insertions(+), 4 deletions(-) >>> >>> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c >>> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c >> [...] >>> @@ -168,12 +166,15 @@ int rtl8821ae_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; >>> - rtlpci->msi_support = rtlpriv->cfg->mod_params->int_clear; >>> + rtlpci->int_clear = rtlpriv->cfg->mod_params->int_clear; >>> + rtlpriv->cfg->mod_params->sw_crypto = >>> + rtlpriv->cfg->mod_params->sw_crypto; >>> + rtlpriv->cfg->mod_params->disable_watchdog = >>> + rtlpriv->cfg->mod_params->disable_watchdog; >> [...] >> >> This is self-assignment. How is that going to help? >> > > Yeah, I did asked that question on the original patchset[1] but never > actually got any reply. > > [1] https://marc.info/?l=linux-wireless&m=145437005409037&w=2 > > Cheers, > -- > Luís > >> Ben. >> >> -- >> Ben Hutchings >> Life is what happens to you while you're busy making other plans. >> - John Lennon It is not going to help. I found some places in the drivers where the module parameters were not being transferred to their final locations. While fixing them, I add this atrocious code. It was a case of having a new hammer, and the whole world looked like a nail. As the original patches were being sent through stable, I did not send remedial patches immediately so as not to generate any confusion. I think these have now propagated through the system, and I will remove those self-assignment lines of code. Larry