diff options
author | Johannes Berg <johannes.berg@intel.com> | 2011-11-09 04:30:21 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-11-11 12:32:50 -0500 |
commit | e999882a052a2959571989b2db2b51893d23c0bb (patch) | |
tree | cbdb8c0ab84e372a0a9466720a058a9a0745349d /net | |
parent | 07ef03ee8b280a536b38ccfe512b9556996f0492 (diff) |
mac80211/cfg80211: report monitor channel in wireless extensions
Just add API to get the channel & report it. Trivial really.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/cfg.c | 9 | ||||
-rw-r--r-- | net/wireless/wext-compat.c | 12 |
2 files changed, 21 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index eb54b6cf85c6..192f213cf43e 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
@@ -2590,6 +2590,14 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev, | |||
2590 | return 0; | 2590 | return 0; |
2591 | } | 2591 | } |
2592 | 2592 | ||
2593 | static struct ieee80211_channel * | ||
2594 | ieee80211_wiphy_get_channel(struct wiphy *wiphy) | ||
2595 | { | ||
2596 | struct ieee80211_local *local = wiphy_priv(wiphy); | ||
2597 | |||
2598 | return local->oper_channel; | ||
2599 | } | ||
2600 | |||
2593 | struct cfg80211_ops mac80211_config_ops = { | 2601 | struct cfg80211_ops mac80211_config_ops = { |
2594 | .add_virtual_intf = ieee80211_add_iface, | 2602 | .add_virtual_intf = ieee80211_add_iface, |
2595 | .del_virtual_intf = ieee80211_del_iface, | 2603 | .del_virtual_intf = ieee80211_del_iface, |
@@ -2656,4 +2664,5 @@ struct cfg80211_ops mac80211_config_ops = { | |||
2656 | .tdls_oper = ieee80211_tdls_oper, | 2664 | .tdls_oper = ieee80211_tdls_oper, |
2657 | .tdls_mgmt = ieee80211_tdls_mgmt, | 2665 | .tdls_mgmt = ieee80211_tdls_mgmt, |
2658 | .probe_client = ieee80211_probe_client, | 2666 | .probe_client = ieee80211_probe_client, |
2667 | .get_channel = ieee80211_wiphy_get_channel, | ||
2659 | }; | 2668 | }; |
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index 62f121d1d9cb..db38c8302b54 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c | |||
@@ -818,12 +818,24 @@ static int cfg80211_wext_giwfreq(struct net_device *dev, | |||
818 | struct iw_freq *freq, char *extra) | 818 | struct iw_freq *freq, char *extra) |
819 | { | 819 | { |
820 | struct wireless_dev *wdev = dev->ieee80211_ptr; | 820 | struct wireless_dev *wdev = dev->ieee80211_ptr; |
821 | struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); | ||
822 | struct ieee80211_channel *chan; | ||
821 | 823 | ||
822 | switch (wdev->iftype) { | 824 | switch (wdev->iftype) { |
823 | case NL80211_IFTYPE_STATION: | 825 | case NL80211_IFTYPE_STATION: |
824 | return cfg80211_mgd_wext_giwfreq(dev, info, freq, extra); | 826 | return cfg80211_mgd_wext_giwfreq(dev, info, freq, extra); |
825 | case NL80211_IFTYPE_ADHOC: | 827 | case NL80211_IFTYPE_ADHOC: |
826 | return cfg80211_ibss_wext_giwfreq(dev, info, freq, extra); | 828 | return cfg80211_ibss_wext_giwfreq(dev, info, freq, extra); |
829 | case NL80211_IFTYPE_MONITOR: | ||
830 | if (!rdev->ops->get_channel) | ||
831 | return -EINVAL; | ||
832 | |||
833 | chan = rdev->ops->get_channel(wdev->wiphy); | ||
834 | if (!chan) | ||
835 | return -EINVAL; | ||
836 | freq->m = chan->center_freq; | ||
837 | freq->e = 6; | ||
838 | return 0; | ||
827 | default: | 839 | default: |
828 | if (!wdev->channel) | 840 | if (!wdev->channel) |
829 | return -EINVAL; | 841 | return -EINVAL; |