Index: chromeos/compat-wireless/net/mac80211/cfg.c |
diff --git a/chromeos/compat-wireless/net/mac80211/cfg.c b/chromeos/compat-wireless/net/mac80211/cfg.c |
index cae654153c46e30ba27c91b2d11a8e8aa63a5fc7..4728e142a7bcb48d114627deac2ab6cf7f00fc84 100644 |
--- a/chromeos/compat-wireless/net/mac80211/cfg.c |
+++ b/chromeos/compat-wireless/net/mac80211/cfg.c |
@@ -634,6 +634,7 @@ static void sta_apply_parameters(struct ieee80211_local *local, |
struct sta_info *sta, |
struct station_parameters *params) |
{ |
+ unsigned long flags; |
u32 rates; |
int i, j; |
struct ieee80211_supported_band *sband; |
@@ -642,7 +643,7 @@ static void sta_apply_parameters(struct ieee80211_local *local, |
sband = local->hw.wiphy->bands[local->oper_channel->band]; |
- spin_lock_bh(&sta->lock); |
+ spin_lock_irqsave(&sta->flaglock, flags); |
mask = params->sta_flags_mask; |
set = params->sta_flags_set; |
@@ -669,7 +670,7 @@ static void sta_apply_parameters(struct ieee80211_local *local, |
if (set & BIT(NL80211_STA_FLAG_MFP)) |
sta->flags |= WLAN_STA_MFP; |
} |
- spin_unlock_bh(&sta->lock); |
+ spin_unlock_irqrestore(&sta->flaglock, flags); |
/* |
* cfg80211 validates this (1-2007) and allows setting the AID |