aboutsummaryrefslogtreecommitdiff
path: root/net/wireless/wext-compat.c
diff options
context:
space:
mode:
authorMichal Kazior <michal.kazior@tieto.com>2012-06-29 12:47:06 +0200
committerJohannes Berg <johannes.berg@intel.com>2012-06-29 13:39:18 +0200
commit2e165b818456ecc1024dd0387eeac64745526377 (patch)
tree6cf33c9bf61f9fbf3849f9d98cffc72bc7f8c37d /net/wireless/wext-compat.c
parenta69b40a95b121c4bfc52a20cccd28708ae550af1 (diff)
downloadlinux-stericsson-2e165b818456ecc1024dd0387eeac64745526377.tar.gz
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/wireless/wext-compat.c')
-rw-r--r--net/wireless/wext-compat.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index bc879833b21f..7df42f541873 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -827,8 +827,6 @@ static int cfg80211_wext_giwfreq(struct net_device *dev,
{
struct wireless_dev *wdev = dev->ieee80211_ptr;
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
- struct ieee80211_channel *chan;
- enum nl80211_channel_type channel_type;
switch (wdev->iftype) {
case NL80211_IFTYPE_STATION:
@@ -836,13 +834,10 @@ static int cfg80211_wext_giwfreq(struct net_device *dev,
case NL80211_IFTYPE_ADHOC:
return cfg80211_ibss_wext_giwfreq(dev, info, freq, extra);
case NL80211_IFTYPE_MONITOR:
- if (!rdev->ops->get_channel)
+ if (!rdev->monitor_channel)
return -EINVAL;
- chan = rdev->ops->get_channel(wdev->wiphy, &channel_type);
- if (!chan)
- return -EINVAL;
- freq->m = chan->center_freq;
+ freq->m = rdev->monitor_channel->center_freq;
freq->e = 6;
return 0;
default: