| From 7079604ddb83f428359feace3aeaf8a9f435be4a Mon Sep 17 00:00:00 2001 |
| From: Larry Finger <Larry.Finger@lwfinger.net> |
| Date: Mon, 14 Dec 2015 16:34:31 -0600 |
| Subject: rtlwifi: rtl8723be: Fix module parameter initialization |
| |
| 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 = { |
