mac80211: use spin_lock_bh() for tim_lock

There's no need to use _irqsave() as the lock
is never used in interrupt context.

This also fixes a problem in the iwlwifi MVM
driver that calls spin_unlock_bh() within its
set_tim() callback.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index f4c89f506e9d..7d8c629f1e6a 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2364,11 +2364,9 @@ static int ieee80211_beacon_add_tim(struct ieee80211_sub_if_data *sdata,
         if (local->tim_in_locked_section) {
                 __ieee80211_beacon_add_tim(sdata, ps, skb);
         } else {
-                unsigned long flags;
-
-                spin_lock_irqsave(&local->tim_lock, flags);
+                spin_lock(&local->tim_lock);
                 __ieee80211_beacon_add_tim(sdata, ps, skb);
-                spin_unlock_irqrestore(&local->tim_lock, flags);
+                spin_unlock(&local->tim_lock);
         }
 
         return 0;