2007-07-10 18:42:15

by Jean Tourrilhes

[permalink] [raw]
Subject: [PATCH 2.6] SoftMAC : fix duplicate display of channel in scan

Hi,

SoftMAC output the channel twice in the scan output. It should
display frequency and channel, but only once for each.
--------------------------------------------------------
Cell 02 - Address: A2:00:04:XX:XX:XX
ESSID:"TheESSID"
Protocol:IEEE 802.11b
Mode:Ad-Hoc
-> Channel:5
-> Frequency:2.432 GHz (Channel 5)
Encryption key:off
Bit Rates:1 Mb/s; 2 Mb/s; 5.5 Mb/s; 11 Mb/s
Quality=95/100 Signal level=-47 dBm Noise level=-65 dBm
Extra: Last beacon: 120ms ago
--------------------------------------------------------
The fix is simple, patch attached, tested for 2.6.22 with
bcm43xx. If you like it, send it to John.
Regards,

Jean

Signed-off-by: Jean Tourrilhes <[email protected]>

-----------------------------------------------------------

--- linux/net/ieee80211/ieee80211_wx.j1.c 2007-07-10 11:28:55.000000000 -0700
+++ linux/net/ieee80211/ieee80211_wx.c 2007-07-10 11:31:18.000000000 -0700
@@ -90,14 +90,11 @@ static char *ieee80211_translate_scan(st
}

/* 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 */



2007-07-12 16:36:05

by Jean Tourrilhes

[permalink] [raw]
Subject: Re: [PATCH 2.6] SoftMAC : fix duplicate display of channel in scan

On Wed, Jul 11, 2007 at 11:30:17PM -0400, Dan Williams wrote:
> On Tue, 2007-07-10 at 14:25 -0500, Larry Finger wrote:
> > Jean,
> >
> > Jean Tourrilhes wrote:
> > > Hi,
> > >
> > > SoftMAC output the channel twice in the scan output. It should
> > > display frequency and channel, but only once for each.
> > > --------------------------------------------------------
> > > Cell 02 - Address: A2:00:04:XX:XX:XX
> > > ESSID:"TheESSID"
> > > Protocol:IEEE 802.11b
> > > Mode:Ad-Hoc
> > > -> Channel:5
> > > -> Frequency:2.432 GHz (Channel 5)
> >
> > The frequency output is needed by NetworkManager, which is why I added it. At that time, I thought
> > that some tool or other might be scanning the output looking for "Channel:", not "Channel ";
> > therefore I left both in. If we are sure that removing the channel-only line will not break
> > something, I'll be happy to send your patch upstream.
>
> Should fix NM, really, to deal with either channel or frequency and
> handle each as appropriate.
>
> Dan

Well, I actually like forcing driver to use frequency, because
that's an absolute physical measure and contains more meaning.
Regards,

Jean

2007-07-10 19:25:24

by Larry Finger

[permalink] [raw]
Subject: Re: [PATCH 2.6] SoftMAC : fix duplicate display of channel in scan

Jean,

Jean Tourrilhes wrote:
> Hi,
>
> SoftMAC output the channel twice in the scan output. It should
> display frequency and channel, but only once for each.
> --------------------------------------------------------
> Cell 02 - Address: A2:00:04:XX:XX:XX
> ESSID:"TheESSID"
> Protocol:IEEE 802.11b
> Mode:Ad-Hoc
> -> Channel:5
> -> Frequency:2.432 GHz (Channel 5)

The frequency output is needed by NetworkManager, which is why I added it. At that time, I thought
that some tool or other might be scanning the output looking for "Channel:", not "Channel ";
therefore I left both in. If we are sure that removing the channel-only line will not break
something, I'll be happy to send your patch upstream.

Larry


2007-07-10 19:47:34

by Jean Tourrilhes

[permalink] [raw]
Subject: Re: [PATCH 2.6] SoftMAC : fix duplicate display of channel in scan

On Tue, Jul 10, 2007 at 02:25:12PM -0500, Larry Finger wrote:
> Jean,
>
> Jean Tourrilhes wrote:
> > Hi,
> >
> > SoftMAC output the channel twice in the scan output. It should
> >display frequency and channel, but only once for each.
> >--------------------------------------------------------
> > Cell 02 - Address: A2:00:04:XX:XX:XX
> > ESSID:"TheESSID"
> > Protocol:IEEE 802.11b
> > Mode:Ad-Hoc
> >-> Channel:5
> >-> Frequency:2.432 GHz (Channel 5)
>
> The frequency output is needed by NetworkManager, which is why I added it.
> At that time, I thought that some tool or other might be scanning the
> output looking for "Channel:", not "Channel "; therefore I left both in.

All of the other drivers display only a single line, and
SoftMAC is the odd one here. I think that have the info twice may
confuse some tools.
I know that there are scripts that parse iwlist output,
however I'm not keen on the practice, as there are alternatives.

> If we are sure that removing the channel-only line will not break
> something, I'll be happy to send your patch upstream.

Unfortunately, I can't guarantee that. I can only guarantee
that it will be similar to what other drivers do.

> Larry

Have fun...

Jean

2007-07-12 03:32:31

by Dan Williams

[permalink] [raw]
Subject: Re: [PATCH 2.6] SoftMAC : fix duplicate display of channel in scan

On Tue, 2007-07-10 at 14:25 -0500, Larry Finger wrote:
> Jean,
>
> Jean Tourrilhes wrote:
> > Hi,
> >
> > SoftMAC output the channel twice in the scan output. It should
> > display frequency and channel, but only once for each.
> > --------------------------------------------------------
> > Cell 02 - Address: A2:00:04:XX:XX:XX
> > ESSID:"TheESSID"
> > Protocol:IEEE 802.11b
> > Mode:Ad-Hoc
> > -> Channel:5
> > -> Frequency:2.432 GHz (Channel 5)
>
> The frequency output is needed by NetworkManager, which is why I added it. At that time, I thought
> that some tool or other might be scanning the output looking for "Channel:", not "Channel ";
> therefore I left both in. If we are sure that removing the channel-only line will not break
> something, I'll be happy to send your patch upstream.

Should fix NM, really, to deal with either channel or frequency and
handle each as appropriate.

Dan

> Larry
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html


2007-07-12 16:40:25

by Larry Finger

[permalink] [raw]
Subject: Re: [PATCH 2.6] SoftMAC : fix duplicate display of channel in scan

Jean Tourrilhes wrote:
>
> Well, I actually like forcing driver to use frequency, because
> that's an absolute physical measure and contains more meaning.

Yes, but it is easier to keep a channel number in your head than a frequency.

Larry

2007-07-12 16:50:29

by Jean Tourrilhes

[permalink] [raw]
Subject: Re: [PATCH 2.6] SoftMAC : fix duplicate display of channel in scan

On Thu, Jul 12, 2007 at 11:40:23AM -0500, Larry Finger wrote:
> Jean Tourrilhes wrote:
> >
> > Well, I actually like forcing driver to use frequency, because
> >that's an absolute physical measure and contains more meaning.
>
> Yes, but it is easier to keep a channel number in your head than a
> frequency.

That's why iwlist display both in 'iwlist freq' and 'iwlist scan'.

> Larry

Jean