ipw2200: SIOCGIWFREQ ioctl returns frequency rather than channel

PATCH In review Zhu Yi 1 participant 1 message Aug 21, 2006

Subsystems (3)

Networking Network drivers Networking drivers (wireless)

lore

Share & tools

lore

Zhu Yi

author

2006-08-21 03:38 UTC #0 lore raw

PATCH 2/14 ipw2200: SIOCGIWFREQ ioctl returns frequency rather than channel

The SIOCGIWFREQ ioctl fills the request structure's freq field by setting the exponent to 0 and the mantissa to the current channel number. The iwconfig tool works around this behaviour by looking up the frequency from the channel table if a frequency below 1kHz is returned, other tools (e.g. kwlaninfo) don't. According to the comment in the iwconfig source the driver is supposed to return the frequency, not the channel number.

Signed-off-by Ingo van Lil <[email protected]>

Signed-off-by Zhu Yi <[email protected]>

---

 drivers/net/wireless/ipw2200.c |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

3ca92c3071e7e849d5d9d01f69c44128428dad30

drivers/net/wireless/ipw2200.c +20 -3

index 89e076f..0b2c774 100644
@@ -8562,9 +8562,26 @@ static int ipw_wx_get_freq(struct net_de
 	 * configured CHANNEL then return that; otherwise return ANY */
 	mutex_lock(&priv->mutex);
 	if (priv->config & CFG_STATIC_CHANNEL ||
-	    priv->status & (STATUS_ASSOCIATING | STATUS_ASSOCIATED))
-		wrqu->freq.m = priv->channel;
-	else
+	    priv->status & (STATUS_ASSOCIATING | STATUS_ASSOCIATED)) {
+		int i;
+
+		i = ieee80211_channel_to_index(priv->ieee, priv->channel);
+		BUG_ON(i == -1);
+		wrqu->freq.e = 1;
+
+		switch (ieee80211_is_valid_channel(priv->ieee, priv->channel)) {
+		case IEEE80211_52GHZ_BAND:
+			wrqu->freq.m = priv->ieee->geo.a[i].freq * 100000;
+			break;
+
+		case IEEE80211_24GHZ_BAND:
+			wrqu->freq.m = priv->ieee->geo.bg[i].freq * 100000;
+			break;
+
+		default:
+			BUG();
+		}
+	} else
 		wrqu->freq.m = 0;
 
 	mutex_unlock(&priv->mutex);

Signature · 1 line

1.2.6