aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rs.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-rs.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index a7d67135e3dc..53f8c51cfcdb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -870,19 +870,16 @@ static void rs_bt_update_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
870{ 870{
871 struct iwl_scale_tbl_info *tbl; 871 struct iwl_scale_tbl_info *tbl;
872 bool full_concurrent = priv->bt_full_concurrent; 872 bool full_concurrent = priv->bt_full_concurrent;
873 unsigned long flags;
874 873
875 if (priv->bt_ant_couple_ok) { 874 if (priv->bt_ant_couple_ok) {
876 /* 875 /*
877 * Is there a need to switch between 876 * Is there a need to switch between
878 * full concurrency and 3-wire? 877 * full concurrency and 3-wire?
879 */ 878 */
880 spin_lock_irqsave(&priv->shrd->lock, flags);
881 if (priv->bt_ci_compliance && priv->bt_ant_couple_ok) 879 if (priv->bt_ci_compliance && priv->bt_ant_couple_ok)
882 full_concurrent = true; 880 full_concurrent = true;
883 else 881 else
884 full_concurrent = false; 882 full_concurrent = false;
885 spin_unlock_irqrestore(&priv->shrd->lock, flags);
886 } 883 }
887 if ((priv->bt_traffic_load != priv->last_bt_traffic_load) || 884 if ((priv->bt_traffic_load != priv->last_bt_traffic_load) ||
888 (priv->bt_full_concurrent != full_concurrent)) { 885 (priv->bt_full_concurrent != full_concurrent)) {
@@ -2680,7 +2677,6 @@ out:
2680 * which requires station table entry to exist). 2677 * which requires station table entry to exist).
2681 */ 2678 */
2682static void rs_initialize_lq(struct iwl_priv *priv, 2679static void rs_initialize_lq(struct iwl_priv *priv,
2683 struct ieee80211_conf *conf,
2684 struct ieee80211_sta *sta, 2680 struct ieee80211_sta *sta,
2685 struct iwl_lq_sta *lq_sta) 2681 struct iwl_lq_sta *lq_sta)
2686{ 2682{
@@ -2915,7 +2911,7 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i
2915 lq_sta->dbg_fixed_rate = 0; 2911 lq_sta->dbg_fixed_rate = 0;
2916#endif 2912#endif
2917 2913
2918 rs_initialize_lq(priv, conf, sta, lq_sta); 2914 rs_initialize_lq(priv, sta, lq_sta);
2919} 2915}
2920 2916
2921static void rs_fill_link_cmd(struct iwl_priv *priv, 2917static void rs_fill_link_cmd(struct iwl_priv *priv,