]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
rtlwifi: rtl8192ce: Fix handling of module parameters
authorLarry Finger <Larry.Finger@lwfinger.net>
Mon, 14 Dec 2015 22:34:37 +0000 (16:34 -0600)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 2 Feb 2016 17:38:50 +0000 (17:38 +0000)
commit b24f19f16b9e43f54218c07609b783ea8625406a upstream.

The module parameter for software encryption was never transferred to
the location used by the driver.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
[ luis: backported to 3.16:
  - drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c ->
    drivers/net/wireless/rtlwifi/rtl8192ce/sw.c ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/net/wireless/rtlwifi/rtl8192ce/sw.c

index 12f21f4073e887c497d4e7efda968d9217515936..a7ded13a8df495fe0b574ab16a68726711359c8c 100644 (file)
@@ -136,6 +136,8 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
        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;
+       rtlpriv->cfg->mod_params->sw_crypto =
+               rtlpriv->cfg->mod_params->sw_crypto;
        if (!rtlpriv->psc.inactiveps)
                pr_info("rtl8192ce: Power Save off (module option)\n");
        if (!rtlpriv->psc.fwctrl_lps)