rt2x00: Implement support for 802.11n

[safe/jmp/linux-2.6] / drivers / net / wireless / rt2x00 / rt2x00config.c

diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c
index 7c62ce1..863e399 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00/rt2x00config.c
@@ -1,5 +1,5 @@
 /*
-       Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
+       Copyright (C) 2004 - 2009 rt2x00 SourceForge Project
        <http://rt2x00.serialmonkey.com>
 
        This program is free software; you can redistribute it and/or modify
@@ -32,7 +32,7 @@
 void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,
                           struct rt2x00_intf *intf,
                           enum nl80211_iftype type,
-                          u8 *mac, u8 *bssid)
+                          const u8 *mac, const u8 *bssid)
 {
        struct rt2x00intf_conf conf;
        unsigned int flags = 0;
@@ -42,6 +42,8 @@ void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,
        switch (type) {
        case NL80211_IFTYPE_ADHOC:
        case NL80211_IFTYPE_AP:
+       case NL80211_IFTYPE_MESH_POINT:
+       case NL80211_IFTYPE_WDS:
                conf.sync = TSF_SYNC_BEACON;
                break;
        case NL80211_IFTYPE_STATION:
@@ -108,33 +110,34 @@ void rt2x00lib_config_erp(struct rt2x00_dev *rt2x00dev,
        rt2x00dev->ops->lib->config_erp(rt2x00dev, &erp);
 }
 
+static inline
+enum antenna rt2x00lib_config_antenna_check(enum antenna current_ant,
+                                           enum antenna default_ant)
+{
+       if (current_ant != ANTENNA_SW_DIVERSITY)
+               return current_ant;
+       return (default_ant != ANTENNA_SW_DIVERSITY) ? default_ant : ANTENNA_B;
+}
+
 void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
                              struct antenna_setup *ant)
 {
+       struct antenna_setup *def = &rt2x00dev->default_ant;
+       struct antenna_setup *active = &rt2x00dev->link.ant.active;
+
        /*
         * Failsafe: Make sure we are not sending the
         * ANTENNA_SW_DIVERSITY state to the driver.
         * If that happes fallback to hardware default,
         * or our own default.
+        * The calls to rt2x00lib_config_antenna_check()
+        * might have caused that we restore back to the already
+        * active setting. If that has happened we can quit.
         */
-       if (ant->rx == ANTENNA_SW_DIVERSITY) {
-               if (rt2x00dev->default_ant.rx == ANTENNA_SW_DIVERSITY)
-                       ant->rx = ANTENNA_B;
-               else
-                       ant->rx = rt2x00dev->default_ant.rx;
-       }
-       if (ant->tx == ANTENNA_SW_DIVERSITY) {
-               if (rt2x00dev->default_ant.tx == ANTENNA_SW_DIVERSITY)
-                       ant->tx = ANTENNA_B;
-               else
-                       ant->tx = rt2x00dev->default_ant.tx;
-       }
+       ant->rx = rt2x00lib_config_antenna_check(ant->rx, def->rx);
+       ant->tx = rt2x00lib_config_antenna_check(ant->tx, def->tx);
 
-       /*
-        * Only reconfigure when something has changed.
-        */
-       if (ant->rx == rt2x00dev->link.ant.active.rx &&
-           ant->tx == rt2x00dev->link.ant.active.tx)
+       if (ant->rx == active->rx && ant->tx == active->tx)
                return;
 
        /*
@@ -151,10 +154,9 @@ void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
         */
        rt2x00dev->ops->lib->config_ant(rt2x00dev, ant);
 
-       rt2x00lib_reset_link_tuner(rt2x00dev);
-       rt2x00_reset_link_ant_rssi(&rt2x00dev->link);
+       rt2x00link_reset_tuner(rt2x00dev, true);
 
-       memcpy(&rt2x00dev->link.ant.active, ant, sizeof(*ant));
+       memcpy(active, ant, sizeof(*ant));
 
        if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
                rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON_LINK);
@@ -171,6 +173,11 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
        libconf.conf = conf;
 
        if (ieee80211_flags & IEEE80211_CONF_CHANGE_CHANNEL) {
+               if (conf_is_ht40(conf))
+                       __set_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags);
+               else
+                       __clear_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags);
+
                memcpy(&libconf.rf,
                       &rt2x00dev->spec.channels[conf->channel->hw_value],
                       sizeof(libconf.rf));
@@ -190,10 +197,12 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
         * which means we need to reset the link tuner.
         */
        if (ieee80211_flags & IEEE80211_CONF_CHANGE_CHANNEL)
-               rt2x00lib_reset_link_tuner(rt2x00dev);
+               rt2x00link_reset_tuner(rt2x00dev, false);
 
        rt2x00dev->curr_band = conf->channel->band;
        rt2x00dev->tx_power = conf->power_level;
+       rt2x00dev->short_retry = conf->short_frame_max_tx_count;
+       rt2x00dev->long_retry = conf->long_frame_max_tx_count;
 
        rt2x00dev->rx_status.band = conf->channel->band;
        rt2x00dev->rx_status.freq = conf->channel->center_freq;