diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 00:52:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 00:52:37 -0700 |
| commit | f42a44494bcdf03fc851c03d438464d59c0ceaf5 (patch) | |
| tree | 986ea7b54e9fc79a64863fd7e92eabd99ffd37a3 /net/mac80211/cfg.c | |
| parent | 63fe46da9c380b3f2bbdf3765044649517cc717c (diff) | |
| parent | ef85ad541f9a6ccd3f89ec73f92b2d6f45a9d3e8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 699d97b8de5..3cef80dcd0e 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -602,6 +602,7 @@ static void sta_apply_parameters(struct ieee80211_local *local, */ if (params->station_flags & STATION_FLAG_CHANGED) { + spin_lock_bh(&sta->lock); sta->flags &= ~WLAN_STA_AUTHORIZED; if (params->station_flags & STATION_FLAG_AUTHORIZED) sta->flags |= WLAN_STA_AUTHORIZED; @@ -613,6 +614,7 @@ static void sta_apply_parameters(struct ieee80211_local *local, sta->flags &= ~WLAN_STA_WME; if (params->station_flags & STATION_FLAG_WME) sta->flags |= WLAN_STA_WME; + spin_unlock_bh(&sta->lock); } /* |