p54: report appropriate rate and band values for 802.11a

This patch adds the a few lines that went missing in
"p54: 802.11a 5GHz phy support"

Essentially: the rx-code wasn't updated and therefore reported the wrong band,
but more importantly the rate index was off as well, since 802.11a doesn't
allow the "four" 802.11b rates...

Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
index de5e8f4..1994aa1 100644 (file)
--- 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);