summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>2011-07-12 14:04:06 +0200
committerPhilippe LANGLAIS <philippe.langlais@stericsson.com>2011-10-12 11:43:07 +0200
commitdf6308e52692e2e122d157d895d258cf799c314e (patch)
tree633ce25944def2ee2b793cc9797a57d6da5731b1
parent76504c992da93be41c383a402f4a701001c6d9e5 (diff)
cw1200: Fix wrongly reported band.
Band for freqencies in range 4000-5000 MHz was incorrectly reported as 2GHz. Fix uses channel number for checking band instead of frequency. Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> Change-Id: Id19840deb3645608e6133cf8efa59567974811a0 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/27032 Reviewed-by: Janusz DZIEDZIC <janusz.dziedzic@tieto.com> Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Tested-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33476 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
-rw-r--r--drivers/staging/cw1200/txrx.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/cw1200/txrx.c b/drivers/staging/cw1200/txrx.c
index 836018a4fb9..65a29fef8ff 100644
--- a/drivers/staging/cw1200/txrx.c
+++ b/drivers/staging/cw1200/txrx.c
@@ -674,11 +674,11 @@ void cw1200_rx_cb(struct cw1200_common *priv,
frame_control = *(__le16*)skb->data;
hdr->mactime = 0; /* Not supported by WSM */
- hdr->freq = ieee80211_channel_to_frequency(arg->channelNumber,
- (arg->channelNumber > 14) ?
- IEEE80211_BAND_5GHZ : IEEE80211_BAND_2GHZ);
- hdr->band = (hdr->freq >= 5000) ?
- IEEE80211_BAND_5GHZ : IEEE80211_BAND_2GHZ;
+ hdr->band = (arg->channelNumber > 14) ?
+ IEEE80211_BAND_5GHZ : IEEE80211_BAND_2GHZ;
+ hdr->freq = ieee80211_channel_to_frequency(
+ arg->channelNumber,
+ hdr->band);
if (arg->rxedRate >= 4)
rate = &priv->rates[arg->rxedRate - 2];