aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorMichal Kazior <michal.kazior@tieto.com>2012-06-29 06:47:06 -0400
committerJohannes Berg <johannes.berg@intel.com>2012-06-29 07:39:18 -0400
commit2e165b818456ecc1024dd0387eeac64745526377 (patch)
tree6cf33c9bf61f9fbf3849f9d98cffc72bc7f8c37d /net/mac80211/cfg.c
parenta69b40a95b121c4bfc52a20cccd28708ae550af1 (diff)
cfg80211/mac80211: remove .get_channel
We do not need it anymore since cfg80211 tracks monitor channel and monitor channel type. Signed-off-by: Michal Kazior <michal.kazior@tieto.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r--net/mac80211/cfg.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index ea4b1ea9105a..ccbe2413142a 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2980,16 +2980,6 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev,
2980 return 0; 2980 return 0;
2981} 2981}
2982 2982
2983static struct ieee80211_channel *
2984ieee80211_wiphy_get_channel(struct wiphy *wiphy,
2985 enum nl80211_channel_type *type)
2986{
2987 struct ieee80211_local *local = wiphy_priv(wiphy);
2988
2989 *type = local->_oper_channel_type;
2990 return local->oper_channel;
2991}
2992
2993static void ieee80211_set_monitor_enabled(struct wiphy *wiphy, bool enabled) 2983static void ieee80211_set_monitor_enabled(struct wiphy *wiphy, bool enabled)
2994{ 2984{
2995 struct ieee80211_local *local = wiphy_priv(wiphy); 2985 struct ieee80211_local *local = wiphy_priv(wiphy);
@@ -3073,7 +3063,6 @@ struct cfg80211_ops mac80211_config_ops = {
3073 .tdls_oper = ieee80211_tdls_oper, 3063 .tdls_oper = ieee80211_tdls_oper,
3074 .tdls_mgmt = ieee80211_tdls_mgmt, 3064 .tdls_mgmt = ieee80211_tdls_mgmt,
3075 .probe_client = ieee80211_probe_client, 3065 .probe_client = ieee80211_probe_client,
3076 .get_channel = ieee80211_wiphy_get_channel,
3077 .set_noack_map = ieee80211_set_noack_map, 3066 .set_noack_map = ieee80211_set_noack_map,
3078 .set_monitor_enabled = ieee80211_set_monitor_enabled, 3067 .set_monitor_enabled = ieee80211_set_monitor_enabled,
3079#ifdef CONFIG_PM 3068#ifdef CONFIG_PM