diff --git a/[refs] b/[refs]
index 7a646624ad6f..e96c3f3df894 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1d8f44a4e3c730984283c0bf4b3458e3a88c15a
+refs/heads/master: 1ebebea8e844d01c80b93b8ee4d696ee7c0cbc27
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index c0a5345c8a61..a5e5c31c23ab 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2248,10 +2248,13 @@ static void ieee80211_rx_bss_put(struct net_device *dev,
 				 struct ieee80211_sta_bss *bss)
 {
 	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-	if (!atomic_dec_and_test(&bss->users))
+
+	local_bh_disable();
+	if (!atomic_dec_and_lock(&bss->users, &local->sta_bss_lock)) {
+		local_bh_enable();
 		return;
+	}
 
-	spin_lock_bh(&local->sta_bss_lock);
 	__ieee80211_rx_bss_hash_del(dev, bss);
 	list_del(&bss->list);
 	spin_unlock_bh(&local->sta_bss_lock);