summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-05-04 17:52:10 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-05-06 21:15:02 +0200
commit7738231f98578c8cd5b367441b4aa79ce864856f (patch)
treeafe231f16d42afd6a78e7c1e44a3999f1dca1b59
parentcfg80211: make nl80211_send_mlme_timeout() static (diff)
downloadlinux-7738231f98578c8cd5b367441b4aa79ce864856f.tar.xz
linux-7738231f98578c8cd5b367441b4aa79ce864856f.zip
mac80211: report operating frequency rather than current
It's not very helpful to see, in iwconfig, the current frequency the card is tuned to if that frequency is currently somewhere across the board because we're scanning. Since we keep track of the frequency the user wants, display that instead. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/wext.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index 1a649da42c41..6b4eb8d43a4e 100644
--- a/net/mac80211/wext.c
+++ b/net/mac80211/wext.c
@@ -185,7 +185,7 @@ static int ieee80211_ioctl_giwfreq(struct net_device *dev,
if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
return cfg80211_ibss_wext_giwfreq(dev, info, freq, extra);
- freq->m = local->hw.conf.channel->center_freq;
+ freq->m = local->oper_channel->center_freq;
freq->e = 6;
return 0;