From 71c7730eaf855d49861d1ecd54c978bcf8636147 Mon Sep 17 00:00:00 2001
From: Holger Schurig <holgerschurig@gmail.com>
Date: Mon, 7 Jun 2010 16:33:49 +0200
Subject: [PATCH] --- yaml --- r: 200279 b: refs/heads/master c:
 35dd0509b21e4b5bab36b9eb80c8dab0322f5007 h: refs/heads/master i:   200277:
 be58fe070ef532387e8a12b799be1359ed29d203   200275:
 2c259213872f78df4d40fc755dd4ccd626df4d26   200271:
 155ce0ca3749ecbbbc8548950c69038fbd7f9aa2 v: v3

---
 [refs]                          | 2 +-
 trunk/net/mac80211/driver-ops.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5ec7078431dc..517cf6589ae8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e500ae5b535a5209fd397fcc542e3b3290fc2fc5
+refs/heads/master: 35dd0509b21e4b5bab36b9eb80c8dab0322f5007
diff --git a/trunk/net/mac80211/driver-ops.h b/trunk/net/mac80211/driver-ops.h
index 4f2271316650..9c1da0809160 100644
--- a/trunk/net/mac80211/driver-ops.h
+++ b/trunk/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;