1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
index de5e8f44b202..1994aa199d37 100644
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@ -507,9 +507,10 @@ static int p54_rx_data(struct ieee80211_hw *dev, struct sk_buff *skb)
         rx_status.noise = priv->noise;
         /* XX correct? */
         rx_status.qual = (100 * hdr->rssi) / 127;
-        rx_status.rate_idx = hdr->rate & 0xf;
+        rx_status.rate_idx = (dev->conf.channel->band == IEEE80211_BAND_2GHZ ?
+                        hdr->rate : (hdr->rate - 4)) & 0xf;
         rx_status.freq = freq;
-        rx_status.band = IEEE80211_BAND_2GHZ;
+        rx_status.band =  dev->conf.channel->band;
         rx_status.antenna = hdr->antenna;
 
         tsf32 = le32_to_cpu(hdr->tsf32);