diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-11 11:38:16 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-11 11:38:16 -0800 |
| commit | 2071a0084a0323697b7d6fd5a98982194bd6929f (patch) | |
| tree | cfa228cd187f600fd93b858b46e656bb24b0020e /drivers/net/wireless/b43 | |
| parent | ff879eb611dba859c4349048a32789e8c82afa91 (diff) | |
| parent | d01032e4fd33110f9f3a085a36cb819c1dfc5827 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'drivers/net/wireless/b43')
| -rw-r--r-- | drivers/net/wireless/b43/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index c806924c7b5c..077480c4916a 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -4521,9 +4521,8 @@ static int b43_op_beacon_set_tim(struct ieee80211_hw *hw, { struct b43_wl *wl = hw_to_b43_wl(hw); - mutex_lock(&wl->mutex); + /* FIXME: add locking */ b43_update_templates(wl); - mutex_unlock(&wl->mutex); return 0; } |