[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    mac80211: reorder channel and freq reporting in wext scan report
From:       Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date:       2008-05-30 15:00:09
Message-ID: 200805301500.m4UF09b6026936 () hera ! kernel ! org
[Download RAW message or body]

Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9381be059bf5831d259e8735005cfa35b7488543
Commit:     9381be059bf5831d259e8735005cfa35b7488543
Parent:     3bf0a32e22fedc0b46443699db2d61ac2a883ac4
Author:     Tomas Winkler <tomas.winkler@intel.com>
AuthorDate: Fri May 23 01:36:36 2008 +0300
Committer:  John W. Linville <linville@tuxdriver.com>
CommitDate: Wed May 28 16:43:43 2008 -0400

    mac80211: reorder channel and freq reporting in wext scan report
    
    This patch switch order of channel and freq (SIOCGIWFREQ) reports
    in scan results in order to overcome wpa_supplicant inability
    to handle channel numbers in 5.2Ghz band.
    Wext reporting channel number is ambiguous as channels 7-12 (802.11j)
    exist on both bands.
    
    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Acked-by: Dan Williams <dcbw@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
 net/mac80211/mlme.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 0ef5993..c29927c 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -4099,18 +4099,17 @@ ieee80211_sta_scan_result(struct net_device *dev,
 
 	memset(&iwe, 0, sizeof(iwe));
 	iwe.cmd = SIOCGIWFREQ;
-	iwe.u.freq.m = bss->freq;
-	iwe.u.freq.e = 6;
+	iwe.u.freq.m = ieee80211_frequency_to_channel(bss->freq);
+	iwe.u.freq.e = 0;
 	current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
 					  IW_EV_FREQ_LEN);
 
 	memset(&iwe, 0, sizeof(iwe));
 	iwe.cmd = SIOCGIWFREQ;
-	iwe.u.freq.m = ieee80211_frequency_to_channel(bss->freq);
-	iwe.u.freq.e = 0;
+	iwe.u.freq.m = bss->freq;
+	iwe.u.freq.e = 6;
 	current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
 					  IW_EV_FREQ_LEN);
-
 	memset(&iwe, 0, sizeof(iwe));
 	iwe.cmd = IWEVQUAL;
 	iwe.u.qual.qual = bss->signal;
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]