diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-13 12:17:09 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-13 12:17:09 -0800 |
| commit | a003460b21323ddb29479505d9555f0985b8b2f1 (patch) | |
| tree | c8c7f2e70d5fdfc91f0ae2b1bd4b7a27913eb1d2 /net/mac80211/sta_info.c | |
| parent | 964ad81cbd933e5fa310faeec1e923c14651284b (diff) | |
| parent | dee60269f0fe90927ce5095eef3a8723bbb9c53e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 211c475f73c6..56422d894351 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -434,6 +434,7 @@ int sta_info_insert_rcu(struct sta_info *sta) __acquires(RCU) /* check if STA exists already */ if (sta_info_get_bss(sdata, sta->sta.addr)) { spin_unlock_irqrestore(&local->sta_lock, flags); + mutex_unlock(&local->sta_mtx); rcu_read_lock(); err = -EEXIST; goto out_free; |