diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-06-07 15:13:46 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-06-07 15:13:46 -0400 |
| commit | 9d88477c41904127ab9ae1f3b5b4a39bf6474043 (patch) | |
| tree | f50d5185ac89a9fd76d7cb087b952d5c55d5063b /net/mac80211/driver-ops.h | |
| parent | 11b7c60988e5fbabb4e150612931cc068559af16 (diff) | |
| parent | 35dd0509b21e4b5bab36b9eb80c8dab0322f5007 (diff) | |
| download | blackbird-op-linux-9d88477c41904127ab9ae1f3b5b4a39bf6474043.tar.gz blackbird-op-linux-9d88477c41904127ab9ae1f3b5b4a39bf6474043.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'net/mac80211/driver-ops.h')
| -rw-r--r-- | net/mac80211/driver-ops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index d1139e4f88a9..7d18a3245e3d 100644 --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h @@ -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; |
