diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-12-15 11:24:20 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-15 20:46:35 +0100 |
| commit | 4d33960bf9fa2c0ee82ba7120e7b56c766dd3a86 (patch) | |
| tree | b75891edc02c3aa754a9fd32e34f408051e77983 /net/mac80211/tx.c | |
| parent | mac80211: delay IBSS station insertion (diff) | |
| download | linux-4d33960bf9fa2c0ee82ba7120e7b56c766dd3a86.tar.xz linux-4d33960bf9fa2c0ee82ba7120e7b56c766dd3a86.zip | |
mac80211: reduce station management complexity
Now that IBSS no longer needs to insert stations
from atomic context, we can get rid of all the
special cases for that, and even get rid of the
sta_lock (though it needs to stay as tim_lock.)
This makes the station management code much more
straight-forward.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 6bbd6cccb4a0..ab033fd00b72 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2333,9 +2333,9 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw, } else { unsigned long flags; - spin_lock_irqsave(&local->sta_lock, flags); + spin_lock_irqsave(&local->tim_lock, flags); ieee80211_beacon_add_tim(ap, skb, beacon); - spin_unlock_irqrestore(&local->sta_lock, flags); + spin_unlock_irqrestore(&local->tim_lock, flags); } if (tim_offset) |