Merge branches 'pxa' and 'orion-fixes1'

[karo-tx-linux.git] / drivers / net / wireless / rt2x00 / rt2x00config.c

diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c
index 20231e0c53fa04956dab524e9a934907aa55b8c8..a9930a03f450636e0cdc47e9098313fc171819ea 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00/rt2x00config.c
@@ -75,43 +75,32 @@ void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,
        rt2x00dev->ops->lib->config_intf(rt2x00dev, intf, &conf, flags);
 }
 
-void rt2x00lib_config_preamble(struct rt2x00_dev *rt2x00dev,
-                              struct rt2x00_intf *intf,
-                              const unsigned int short_preamble)
+void rt2x00lib_config_erp(struct rt2x00_dev *rt2x00dev,
+                         struct rt2x00_intf *intf,
+                         struct ieee80211_bss_conf *bss_conf)
 {
-       int retval;
-       int ack_timeout;
-       int ack_consume_time;
+       struct rt2x00lib_erp erp;
 
-       ack_timeout = PLCP + get_duration(ACK_SIZE, 10);
-       ack_consume_time = SIFS + PLCP + get_duration(ACK_SIZE, 10);
+       memset(&erp, 0, sizeof(erp));
+
+       erp.short_preamble = bss_conf->use_short_preamble;
+       erp.ack_timeout = PLCP + get_duration(ACK_SIZE, 10);
+       erp.ack_consume_time = SIFS + PLCP + get_duration(ACK_SIZE, 10);
 
        if (rt2x00dev->hw->conf.flags & IEEE80211_CONF_SHORT_SLOT_TIME)
-               ack_timeout += SHORT_DIFS;
+               erp.ack_timeout += SHORT_DIFS;
        else
-               ack_timeout += DIFS;
+               erp.ack_timeout += DIFS;
 
-       if (short_preamble) {
-               ack_timeout += SHORT_PREAMBLE;
-               ack_consume_time += SHORT_PREAMBLE;
+       if (bss_conf->use_short_preamble) {
+               erp.ack_timeout += SHORT_PREAMBLE;
+               erp.ack_consume_time += SHORT_PREAMBLE;
        } else {
-               ack_timeout += PREAMBLE;
-               ack_consume_time += PREAMBLE;
-       }
-
-       retval = rt2x00dev->ops->lib->config_preamble(rt2x00dev,
-                                                     short_preamble,
-                                                     ack_timeout,
-                                                     ack_consume_time);
-
-       spin_lock(&intf->lock);
-
-       if (retval) {
-               intf->delayed_flags |= DELAYED_CONFIG_PREAMBLE;
-               queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->intf_work);
+               erp.ack_timeout += PREAMBLE;
+               erp.ack_consume_time += PREAMBLE;
        }
 
-       spin_unlock(&intf->lock);
+       rt2x00dev->ops->lib->config_erp(rt2x00dev, &erp);
 }
 
 void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
@@ -148,12 +137,26 @@ void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
                rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON_LINK);
 }
 
+static u32 rt2x00lib_get_basic_rates(struct ieee80211_supported_band *band)
+{
+       const struct rt2x00_rate *rate;
+       unsigned int i;
+       u32 mask = 0;
+
+       for (i = 0; i < band->n_bitrates; i++) {
+               rate = rt2x00_get_rate(band->bitrates[i].hw_value);
+               if (rate->flags & DEV_RATE_BASIC)
+                       mask |= rate->ratemask;
+       }
+
+       return mask;
+}
+
 void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
                      struct ieee80211_conf *conf, const int force_config)
 {
        struct rt2x00lib_conf libconf;
-       struct ieee80211_hw_mode *mode;
-       struct ieee80211_rate *rate;
+       struct ieee80211_supported_band *band;
        struct antenna_setup *default_ant = &rt2x00dev->default_ant;
        struct antenna_setup *active_ant = &rt2x00dev->link.ant.active;
        int flags = 0;
@@ -172,9 +175,9 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
         * Check which configuration options have been
         * updated and should be send to the device.
         */
-       if (rt2x00dev->rx_status.phymode != conf->phymode)
+       if (rt2x00dev->rx_status.band != conf->channel->band)
                flags |= CONFIG_UPDATE_PHYMODE;
-       if (rt2x00dev->rx_status.channel != conf->channel)
+       if (rt2x00dev->rx_status.freq != conf->channel->center_freq)
                flags |= CONFIG_UPDATE_CHANNEL;
        if (rt2x00dev->tx_power != conf->power_level)
                flags |= CONFIG_UPDATE_TXPOWER;
@@ -229,33 +232,15 @@ config:
        memset(&libconf, 0, sizeof(libconf));
 
        if (flags & CONFIG_UPDATE_PHYMODE) {
-               switch (conf->phymode) {
-               case MODE_IEEE80211A:
-                       libconf.phymode = HWMODE_A;
-                       break;
-               case MODE_IEEE80211B:
-                       libconf.phymode = HWMODE_B;
-                       break;
-               case MODE_IEEE80211G:
-                       libconf.phymode = HWMODE_G;
-                       break;
-               default:
-                       ERROR(rt2x00dev,
-                             "Attempt to configure unsupported mode (%d)"
-                             "Defaulting to 802.11b", conf->phymode);
-                       libconf.phymode = HWMODE_B;
-               }
-
-               mode = &rt2x00dev->hwmodes[libconf.phymode];
-               rate = &mode->rates[mode->num_rates - 1];
-
-               libconf.basic_rates =
-                   DEVICE_GET_RATE_FIELD(rate->val, RATEMASK) & DEV_BASIC_RATEMASK;
+               band = &rt2x00dev->bands[conf->channel->band];
+
+               libconf.band = conf->channel->band;
+               libconf.basic_rates = rt2x00lib_get_basic_rates(band);
        }
 
        if (flags & CONFIG_UPDATE_CHANNEL) {
                memcpy(&libconf.rf,
-                      &rt2x00dev->spec.channels[conf->channel_val],
+                      &rt2x00dev->spec.channels[conf->channel->hw_value],
                       sizeof(libconf.rf));
        }
 
@@ -301,12 +286,11 @@ config:
                rt2x00lib_reset_link_tuner(rt2x00dev);
 
        if (flags & CONFIG_UPDATE_PHYMODE) {
-               rt2x00dev->curr_hwmode = libconf.phymode;
-               rt2x00dev->rx_status.phymode = conf->phymode;
+               rt2x00dev->curr_band = conf->channel->band;
+               rt2x00dev->rx_status.band = conf->channel->band;
        }
 
-       rt2x00dev->rx_status.freq = conf->freq;
-       rt2x00dev->rx_status.channel = conf->channel;
+       rt2x00dev->rx_status.freq = conf->channel->center_freq;
        rt2x00dev->tx_power = conf->power_level;
 
        if (flags & CONFIG_UPDATE_ANTENNA) {