Merge branch 'linus' into sched/urgent

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / rtl8180_sa2400.c

diff --git a/drivers/net/wireless/rtl8180_sa2400.c b/drivers/net/wireless/rtl8180_sa2400.c
index e08ace7b1cb7ac3657d42375cbeea60edbbda4c3..cea4e0ccb92dc17c509a90ce0da211112b0842cc 100644 (file)
--- a/drivers/net/wireless/rtl8180_sa2400.c
+++ b/drivers/net/wireless/rtl8180_sa2400.c
@@ -80,12 +80,13 @@ static void sa2400_rf_set_channel(struct ieee80211_hw *dev,
                                  struct ieee80211_conf *conf)
 {
        struct rtl8180_priv *priv = dev->priv;
-       u32 txpw = priv->channels[conf->channel - 1].val & 0xFF;
-       u32 chan = sa2400_chan[conf->channel - 1];
+       int channel = ieee80211_frequency_to_channel(conf->channel->center_freq);
+       u32 txpw = priv->channels[channel - 1].hw_value & 0xFF;
+       u32 chan = sa2400_chan[channel - 1];
 
        write_sa2400(dev, 7, txpw);
 
-       sa2400_write_phy_antenna(dev, chan);
+       sa2400_write_phy_antenna(dev, channel);
 
        write_sa2400(dev, 0, chan);
        write_sa2400(dev, 1, 0xbb50);