| From 06f34572c6110e2e2d5e653a957f1d74db9e3f2b Mon Sep 17 00:00:00 2001 |
| From: Larry Finger <Larry.Finger@lwfinger.net> |
| Date: Mon, 14 Dec 2015 16:34:34 -0600 |
| Subject: rtlwifi: rtl8188ee: Fix module parameter initialization |
| |
| 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) |
