diff options
Diffstat (limited to 'drivers/net/wireless/bcm43xx/bcm43xx_wx.c')
-rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c index a659442b9c15..6961be682c9d 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c | |||
@@ -261,22 +261,22 @@ static int bcm43xx_wx_get_rangeparams(struct net_device *net_dev, | |||
261 | if (phy->type == BCM43xx_PHYTYPE_A || | 261 | if (phy->type == BCM43xx_PHYTYPE_A || |
262 | phy->type == BCM43xx_PHYTYPE_G) { | 262 | phy->type == BCM43xx_PHYTYPE_G) { |
263 | range->num_bitrates = 8; | 263 | range->num_bitrates = 8; |
264 | range->bitrate[i++] = IEEE80211_OFDM_RATE_6MB; | 264 | range->bitrate[i++] = IEEE80211_OFDM_RATE_6MB * 500000; |
265 | range->bitrate[i++] = IEEE80211_OFDM_RATE_9MB; | 265 | range->bitrate[i++] = IEEE80211_OFDM_RATE_9MB * 500000; |
266 | range->bitrate[i++] = IEEE80211_OFDM_RATE_12MB; | 266 | range->bitrate[i++] = IEEE80211_OFDM_RATE_12MB * 500000; |
267 | range->bitrate[i++] = IEEE80211_OFDM_RATE_18MB; | 267 | range->bitrate[i++] = IEEE80211_OFDM_RATE_18MB * 500000; |
268 | range->bitrate[i++] = IEEE80211_OFDM_RATE_24MB; | 268 | range->bitrate[i++] = IEEE80211_OFDM_RATE_24MB * 500000; |
269 | range->bitrate[i++] = IEEE80211_OFDM_RATE_36MB; | 269 | range->bitrate[i++] = IEEE80211_OFDM_RATE_36MB * 500000; |
270 | range->bitrate[i++] = IEEE80211_OFDM_RATE_48MB; | 270 | range->bitrate[i++] = IEEE80211_OFDM_RATE_48MB * 500000; |
271 | range->bitrate[i++] = IEEE80211_OFDM_RATE_54MB; | 271 | range->bitrate[i++] = IEEE80211_OFDM_RATE_54MB * 500000; |
272 | } | 272 | } |
273 | if (phy->type == BCM43xx_PHYTYPE_B || | 273 | if (phy->type == BCM43xx_PHYTYPE_B || |
274 | phy->type == BCM43xx_PHYTYPE_G) { | 274 | phy->type == BCM43xx_PHYTYPE_G) { |
275 | range->num_bitrates += 4; | 275 | range->num_bitrates += 4; |
276 | range->bitrate[i++] = IEEE80211_CCK_RATE_1MB; | 276 | range->bitrate[i++] = IEEE80211_CCK_RATE_1MB * 500000; |
277 | range->bitrate[i++] = IEEE80211_CCK_RATE_2MB; | 277 | range->bitrate[i++] = IEEE80211_CCK_RATE_2MB * 500000; |
278 | range->bitrate[i++] = IEEE80211_CCK_RATE_5MB; | 278 | range->bitrate[i++] = IEEE80211_CCK_RATE_5MB * 500000; |
279 | range->bitrate[i++] = IEEE80211_CCK_RATE_11MB; | 279 | range->bitrate[i++] = IEEE80211_CCK_RATE_11MB * 500000; |
280 | } | 280 | } |
281 | 281 | ||
282 | geo = ieee80211_get_geo(bcm->ieee); | 282 | geo = ieee80211_get_geo(bcm->ieee); |
@@ -286,7 +286,7 @@ static int bcm43xx_wx_get_rangeparams(struct net_device *net_dev, | |||
286 | if (j == IW_MAX_FREQUENCIES) | 286 | if (j == IW_MAX_FREQUENCIES) |
287 | break; | 287 | break; |
288 | range->freq[j].i = j + 1; | 288 | range->freq[j].i = j + 1; |
289 | range->freq[j].m = geo->a[i].freq;//FIXME? | 289 | range->freq[j].m = geo->a[i].freq * 100000; |
290 | range->freq[j].e = 1; | 290 | range->freq[j].e = 1; |
291 | j++; | 291 | j++; |
292 | } | 292 | } |
@@ -294,7 +294,7 @@ static int bcm43xx_wx_get_rangeparams(struct net_device *net_dev, | |||
294 | if (j == IW_MAX_FREQUENCIES) | 294 | if (j == IW_MAX_FREQUENCIES) |
295 | break; | 295 | break; |
296 | range->freq[j].i = j + 1; | 296 | range->freq[j].i = j + 1; |
297 | range->freq[j].m = geo->bg[i].freq;//FIXME? | 297 | range->freq[j].m = geo->bg[i].freq * 100000; |
298 | range->freq[j].e = 1; | 298 | range->freq[j].e = 1; |
299 | j++; | 299 | j++; |
300 | } | 300 | } |