xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-1000.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-core.h
This commit is contained in:
David S. Miller
2009-11-11 11:38:16 -08:00
parent ff879eb611 d01032e4fd
commit 2071a0084a
7 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/b43/main.c
View File

@@ -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;
}