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:
	net/mac80211/debugfs_sta.c
	net/mac80211/sta_info.h
This commit is contained in:
John W. Linville
2012-02-15 16:24:37 -05:00
parent 12325280df 2504a6423b
commit ca994a36f5
2634 changed files with 108674 additions and 44920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/main.c
View File

@@ -909,6 +909,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n",
result);
ieee80211_led_init(local);
rtnl_lock();
result = ieee80211_init_rate_ctrl_alg(local,
@@ -930,8 +932,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
rtnl_unlock();
ieee80211_led_init(local);
local->network_latency_notifier.notifier_call =
ieee80211_max_network_latency;
result = pm_qos_add_notifier(PM_QOS_NETWORK_LATENCY,