diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-07-18 18:31:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-07-18 18:31:03 -0400 |
| commit | 5e1751f8396544df3b334afd2e67557757d47fb0 (patch) | |
| tree | 49a5caca5e5432822913b777cfda30ebda1aac0d /net | |
| parent | dbf812d6ae6da1bfd01ea6abc5af60b358e4f9ba (diff) | |
| parent | 25343469e77bd6f5694bb6b641a8ea1bd2173782 (diff) | |
| download | linux-5e1751f8396544df3b334afd2e67557757d47fb0.tar.gz linux-5e1751f8396544df3b334afd2e67557757d47fb0.tar.bz2 linux-5e1751f8396544df3b334afd2e67557757d47fb0.zip | |
Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'net')
| -rw-r--r-- | net/ieee80211/ieee80211_wx.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c index 523a137d49dd..465b73d50532 100644 --- a/net/ieee80211/ieee80211_wx.c +++ b/net/ieee80211/ieee80211_wx.c @@ -90,14 +90,11 @@ static char *ieee80211_translate_scan(struct ieee80211_device *ieee, } /* Add channel and frequency */ + /* Note : userspace automatically computes channel using iwrange */ iwe.cmd = SIOCGIWFREQ; - iwe.u.freq.m = network->channel; - iwe.u.freq.e = 0; - iwe.u.freq.i = 0; - start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN); - iwe.u.freq.m = ieee80211_channel_to_freq(ieee, network->channel); iwe.u.freq.e = 6; + iwe.u.freq.i = 0; start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN); /* Add encryption capability */ |