From df6308e52692e2e122d157d895d258cf799c314e Mon Sep 17 00:00:00 2001 From: Dmitry Tarnyagin Date: Tue, 12 Jul 2011 14:04:06 +0200 Subject: 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 Change-Id: Id19840deb3645608e6133cf8efa59567974811a0 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/27032 Reviewed-by: Janusz DZIEDZIC Reviewed-by: Bartosz MARKOWSKI Tested-by: Bartosz MARKOWSKI Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33476 Reviewed-by: Philippe LANGLAIS --- drivers/staging/cw1200/txrx.c | 10 +++++----- 1 file 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]; -- cgit v1.2.3