Commit 78bae1de authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: rtl8821ae: Fix errors in parameter initialization 



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: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 793b0999

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c

+5 −4
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw) 
	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));



	rtl8821ae_bt_reg_init(hw);

	rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;

	rtlpci->int_clear = rtlpriv->cfg->mod_params->int_clear;

	rtlpriv->btcoexist.btc_ops = rtl_btc_get_ops_pointer();



	rtlpriv->dm.dm_initialgain_enable = 1;
@@ -168,12 +166,15 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw) 
	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;

	if (rtlpriv->cfg->mod_params->disable_watchdog)

		pr_info("watchdog disabled\n");

	rtlpriv->psc.reg_fwctrl_lps = 3;

	rtlpriv->psc.reg_max_lps_awakeintvl = 5;

	rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;



	/* for ASPM, you can close aspm through

	 * set const_support_pciaspm = 0