lkml.org 
[lkml]   [2016]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 112/117] rtlwifi: rtl8821ae: Fix errors in parameter initialization
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Larry Finger <Larry.Finger@lwfinger.net>

    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 <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/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
    @@ -95,8 +95,6 @@ int rtl8821ae_init_sw_vars(struct ieee80
    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 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;
    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

    \
     
     \ /
      Last update: 2016-02-15 02:01    [W:4.417 / U:2.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site