git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[safe/jmp/linux-2.6]
/
net
/
mac80211
/
driver-ops.h
diff --git
a/net/mac80211/driver-ops.h
b/net/mac80211/driver-ops.h
index
4f22713
..
9c1da08
100644
(file)
--- a/
net/mac80211/driver-ops.h
+++ b/
net/mac80211/driver-ops.h
@@
-349,7
+349,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;