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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Browse Source 
Conflicts:
	MAINTAINERS
	drivers/net/wireless/iwlwifi/pcie/trans.c
This commit is contained in:
John W. Linville
2012-06-12 14:09:59 -04:00
parent 7f0d9f430d 6aee4ca3d2
commit a59f975a78
13 changed files with 69 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/mac80211/mlme.c
View File

@@ -3100,7 +3100,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
}
local->oper_channel = cbss->channel;
ieee80211_hw_config(local, 0);
ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
if (!have_sta) {
u32 rates = 0, basic_rates = 0;