diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/core.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/core.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c index d6a924a0565..b0996bf8a21 100644 --- a/drivers/net/wireless/rtlwifi/core.c +++ b/drivers/net/wireless/rtlwifi/core.c | |||
@@ -434,9 +434,9 @@ static int rtl_op_conf_tx(struct ieee80211_hw *hw, u16 queue, | |||
434 | 434 | ||
435 | aci = _rtl_get_hal_qnum(queue); | 435 | aci = _rtl_get_hal_qnum(queue); |
436 | mac->ac[aci].aifs = param->aifs; | 436 | mac->ac[aci].aifs = param->aifs; |
437 | mac->ac[aci].cw_min = param->cw_min; | 437 | mac->ac[aci].cw_min = cpu_to_le16(param->cw_min); |
438 | mac->ac[aci].cw_max = param->cw_max; | 438 | mac->ac[aci].cw_max = cpu_to_le16(param->cw_max); |
439 | mac->ac[aci].tx_op = param->txop; | 439 | mac->ac[aci].tx_op = cpu_to_le16(param->txop); |
440 | memcpy(&mac->edca_param[aci], param, sizeof(*param)); | 440 | memcpy(&mac->edca_param[aci], param, sizeof(*param)); |
441 | rtlpriv->cfg->ops->set_qos(hw, aci); | 441 | rtlpriv->cfg->ops->set_qos(hw, aci); |
442 | return 0; | 442 | return 0; |
@@ -666,7 +666,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, | |||
666 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_BASIC_RATE, | 666 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_BASIC_RATE, |
667 | (u8 *) (&basic_rates)); | 667 | (u8 *) (&basic_rates)); |
668 | 668 | ||
669 | if (rtlpriv->dm.b_useramask) | 669 | if (rtlpriv->dm.useramask) |
670 | rtlpriv->cfg->ops->update_rate_mask(hw, 0); | 670 | rtlpriv->cfg->ops->update_rate_mask(hw, 0); |
671 | else | 671 | else |
672 | rtlpriv->cfg->ops->update_rate_table(hw); | 672 | rtlpriv->cfg->ops->update_rate_table(hw); |
@@ -681,7 +681,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, | |||
681 | */ | 681 | */ |
682 | if (changed & BSS_CHANGED_ASSOC) { | 682 | if (changed & BSS_CHANGED_ASSOC) { |
683 | if (bss_conf->assoc) { | 683 | if (bss_conf->assoc) { |
684 | if (ppsc->b_fwctrl_lps) { | 684 | if (ppsc->fwctrl_lps) { |
685 | u8 mstatus = RT_MEDIA_CONNECT; | 685 | u8 mstatus = RT_MEDIA_CONNECT; |
686 | rtlpriv->cfg->ops->set_hw_reg(hw, | 686 | rtlpriv->cfg->ops->set_hw_reg(hw, |
687 | HW_VAR_H2C_FW_JOINBSSRPT, | 687 | HW_VAR_H2C_FW_JOINBSSRPT, |
@@ -689,7 +689,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, | |||
689 | ppsc->report_linked = true; | 689 | ppsc->report_linked = true; |
690 | } | 690 | } |
691 | } else { | 691 | } else { |
692 | if (ppsc->b_fwctrl_lps) { | 692 | if (ppsc->fwctrl_lps) { |
693 | u8 mstatus = RT_MEDIA_DISCONNECT; | 693 | u8 mstatus = RT_MEDIA_DISCONNECT; |
694 | rtlpriv->cfg->ops->set_hw_reg(hw, | 694 | rtlpriv->cfg->ops->set_hw_reg(hw, |
695 | HW_VAR_H2C_FW_JOINBSSRPT, | 695 | HW_VAR_H2C_FW_JOINBSSRPT, |
@@ -748,7 +748,8 @@ static void rtl_op_sta_notify(struct ieee80211_hw *hw, | |||
748 | static int rtl_op_ampdu_action(struct ieee80211_hw *hw, | 748 | static int rtl_op_ampdu_action(struct ieee80211_hw *hw, |
749 | struct ieee80211_vif *vif, | 749 | struct ieee80211_vif *vif, |
750 | enum ieee80211_ampdu_mlme_action action, | 750 | enum ieee80211_ampdu_mlme_action action, |
751 | struct ieee80211_sta *sta, u16 tid, u16 * ssn) | 751 | struct ieee80211_sta *sta, u16 tid, u16 *ssn, |
752 | u8 buf_size) | ||
752 | { | 753 | { |
753 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 754 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
754 | 755 | ||
@@ -817,7 +818,7 @@ static void rtl_op_sw_scan_complete(struct ieee80211_hw *hw) | |||
817 | /* fix fwlps issue */ | 818 | /* fix fwlps issue */ |
818 | rtlpriv->cfg->ops->set_network_type(hw, mac->opmode); | 819 | rtlpriv->cfg->ops->set_network_type(hw, mac->opmode); |
819 | 820 | ||
820 | if (rtlpriv->dm.b_useramask) | 821 | if (rtlpriv->dm.useramask) |
821 | rtlpriv->cfg->ops->update_rate_mask(hw, 0); | 822 | rtlpriv->cfg->ops->update_rate_mask(hw, 0); |
822 | else | 823 | else |
823 | rtlpriv->cfg->ops->update_rate_table(hw); | 824 | rtlpriv->cfg->ops->update_rate_table(hw); |