Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/ath/ath9k/hw.c

1 files changed, 0 insertions, 37 deletions

diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index a7cd311cb1b7..3fa1ecebadfd 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -1631,42 +1631,6 @@ static int lbs_cfg_get_station(struct wiphy *wiphy, struct net_device *dev,
 
 
 /*
- * "Site survey", here just current channel and noise level
- */
-
-static int lbs_get_survey(struct wiphy *wiphy, struct net_device *dev,
-        int idx, struct survey_info *survey)
-{
-        struct lbs_private *priv = wiphy_priv(wiphy);
-        s8 signal, noise;
-        int ret;
-
-        if (dev == priv->mesh_dev)
-                return -EOPNOTSUPP;
-
-        if (idx != 0)
-                ret = -ENOENT;
-
-        lbs_deb_enter(LBS_DEB_CFG80211);
-
-        survey->channel = ieee80211_get_channel(wiphy,
-                ieee80211_channel_to_frequency(priv->channel,
-                                               IEEE80211_BAND_2GHZ));
-
-        ret = lbs_get_rssi(priv, &signal, &noise);
-        if (ret == 0) {
-                survey->filled = SURVEY_INFO_NOISE_DBM;
-                survey->noise = noise;
-        }
-
-        lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);
-        return ret;
-}
-
-
-
-
-/*
  * Change interface
  */
 
@@ -2068,7 +2032,6 @@ static struct cfg80211_ops lbs_cfg80211_ops = {
         .del_key = lbs_cfg_del_key,
         .set_default_key = lbs_cfg_set_default_key,
         .get_station = lbs_cfg_get_station,
-        .dump_survey = lbs_get_survey,
         .change_virtual_intf = lbs_change_intf,
         .join_ibss = lbs_join_ibss,
         .leave_ibss = lbs_leave_ibss,