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-2.6

Browse Source 
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-core.h
This commit is contained in:
John W. Linville
2010-06-07 15:13:46 -04:00
parent 11b7c60988 35dd0509b2
commit 9d88477c41
16 changed files with 340 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/mac80211/driver-ops.h
View File

@@ -360,7 +360,7 @@ static inline int drv_get_survey(struct ieee80211_local *local, int idx,
struct survey_info *survey)
{
int ret = -EOPNOTSUPP;
if (local->ops->conf_tx)
if (local->ops->get_survey)
ret = local->ops->get_survey(&local->hw, idx, survey);
/* trace_drv_get_survey(local, idx, survey, ret); */
return ret;