05253c93fe
When rssi_a > rssi_b is true and the current antenna was already antenna A, then rt2x00 incorrectly jumped to antenna B. Also don't configure the antenna when there has been no change in the antenna setup. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
291 lines
8.4 KiB
C
291 lines
8.4 KiB
C
/*
|
|
Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
|
|
<http://rt2x00.serialmonkey.com>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the
|
|
Free Software Foundation, Inc.,
|
|
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
/*
|
|
Module: rt2x00lib
|
|
Abstract: rt2x00 generic configuration routines.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
|
|
#include "rt2x00.h"
|
|
#include "rt2x00lib.h"
|
|
|
|
|
|
/*
|
|
* The MAC and BSSID addressess are simple array of bytes,
|
|
* these arrays are little endian, so when sending the addressess
|
|
* to the drivers, copy the it into a endian-signed variable.
|
|
*
|
|
* Note that all devices (except rt2500usb) have 32 bits
|
|
* register word sizes. This means that whatever variable we
|
|
* pass _must_ be a multiple of 32 bits. Otherwise the device
|
|
* might not accept what we are sending to it.
|
|
* This will also make it easier for the driver to write
|
|
* the data to the device.
|
|
*
|
|
* Also note that when NULL is passed as address the
|
|
* we will send 00:00:00:00:00 to the device to clear the address.
|
|
* This will prevent the device being confused when it wants
|
|
* to ACK frames or consideres itself associated.
|
|
*/
|
|
void rt2x00lib_config_mac_addr(struct rt2x00_dev *rt2x00dev, u8 *mac)
|
|
{
|
|
__le32 reg[2];
|
|
|
|
memset(®, 0, sizeof(reg));
|
|
if (mac)
|
|
memcpy(®, mac, ETH_ALEN);
|
|
|
|
rt2x00dev->ops->lib->config_mac_addr(rt2x00dev, ®[0]);
|
|
}
|
|
|
|
void rt2x00lib_config_bssid(struct rt2x00_dev *rt2x00dev, u8 *bssid)
|
|
{
|
|
__le32 reg[2];
|
|
|
|
memset(®, 0, sizeof(reg));
|
|
if (bssid)
|
|
memcpy(®, bssid, ETH_ALEN);
|
|
|
|
rt2x00dev->ops->lib->config_bssid(rt2x00dev, ®[0]);
|
|
}
|
|
|
|
void rt2x00lib_config_type(struct rt2x00_dev *rt2x00dev, const int type)
|
|
{
|
|
int tsf_sync;
|
|
|
|
switch (type) {
|
|
case IEEE80211_IF_TYPE_IBSS:
|
|
case IEEE80211_IF_TYPE_AP:
|
|
tsf_sync = TSF_SYNC_BEACON;
|
|
break;
|
|
case IEEE80211_IF_TYPE_STA:
|
|
tsf_sync = TSF_SYNC_INFRA;
|
|
break;
|
|
default:
|
|
tsf_sync = TSF_SYNC_NONE;
|
|
break;
|
|
}
|
|
|
|
rt2x00dev->ops->lib->config_type(rt2x00dev, type, tsf_sync);
|
|
}
|
|
|
|
void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
|
|
enum antenna rx, enum antenna tx)
|
|
{
|
|
struct rt2x00lib_conf libconf;
|
|
|
|
libconf.ant.rx = rx;
|
|
libconf.ant.tx = tx;
|
|
|
|
if (rx == rt2x00dev->link.ant.active.rx &&
|
|
tx == rt2x00dev->link.ant.active.tx)
|
|
return;
|
|
|
|
/*
|
|
* Antenna setup changes require the RX to be disabled,
|
|
* else the changes will be ignored by the device.
|
|
*/
|
|
if (test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags))
|
|
rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF_LINK);
|
|
|
|
/*
|
|
* Write new antenna setup to device and reset the link tuner.
|
|
* The latter is required since we need to recalibrate the
|
|
* noise-sensitivity ratio for the new setup.
|
|
*/
|
|
rt2x00dev->ops->lib->config(rt2x00dev, CONFIG_UPDATE_ANTENNA, &libconf);
|
|
rt2x00lib_reset_link_tuner(rt2x00dev);
|
|
|
|
rt2x00dev->link.ant.active.rx = libconf.ant.rx;
|
|
rt2x00dev->link.ant.active.tx = libconf.ant.tx;
|
|
|
|
if (test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags))
|
|
rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON_LINK);
|
|
}
|
|
|
|
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 antenna_setup *default_ant = &rt2x00dev->default_ant;
|
|
struct antenna_setup *active_ant = &rt2x00dev->link.ant.active;
|
|
int flags = 0;
|
|
int short_slot_time;
|
|
|
|
/*
|
|
* In some situations we want to force all configurations
|
|
* to be reloaded (When resuming for instance).
|
|
*/
|
|
if (force_config) {
|
|
flags = CONFIG_UPDATE_ALL;
|
|
goto config;
|
|
}
|
|
|
|
/*
|
|
* Check which configuration options have been
|
|
* updated and should be send to the device.
|
|
*/
|
|
if (rt2x00dev->rx_status.phymode != conf->phymode)
|
|
flags |= CONFIG_UPDATE_PHYMODE;
|
|
if (rt2x00dev->rx_status.channel != conf->channel)
|
|
flags |= CONFIG_UPDATE_CHANNEL;
|
|
if (rt2x00dev->tx_power != conf->power_level)
|
|
flags |= CONFIG_UPDATE_TXPOWER;
|
|
|
|
/*
|
|
* Determining changes in the antenna setups request several checks:
|
|
* antenna_sel_{r,t}x = 0
|
|
* -> Does active_{r,t}x match default_{r,t}x
|
|
* -> Is default_{r,t}x SW_DIVERSITY
|
|
* antenna_sel_{r,t}x = 1/2
|
|
* -> Does active_{r,t}x match antenna_sel_{r,t}x
|
|
* The reason for not updating the antenna while SW diversity
|
|
* should be used is simple: Software diversity means that
|
|
* we should switch between the antenna's based on the
|
|
* quality. This means that the current antenna is good enough
|
|
* to work with untill the link tuner decides that an antenna
|
|
* switch should be performed.
|
|
*/
|
|
if (!conf->antenna_sel_rx &&
|
|
default_ant->rx != ANTENNA_SW_DIVERSITY &&
|
|
default_ant->rx != active_ant->rx)
|
|
flags |= CONFIG_UPDATE_ANTENNA;
|
|
else if (conf->antenna_sel_rx &&
|
|
conf->antenna_sel_rx != active_ant->rx)
|
|
flags |= CONFIG_UPDATE_ANTENNA;
|
|
else if (active_ant->rx == ANTENNA_SW_DIVERSITY)
|
|
flags |= CONFIG_UPDATE_ANTENNA;
|
|
|
|
if (!conf->antenna_sel_tx &&
|
|
default_ant->tx != ANTENNA_SW_DIVERSITY &&
|
|
default_ant->tx != active_ant->tx)
|
|
flags |= CONFIG_UPDATE_ANTENNA;
|
|
else if (conf->antenna_sel_tx &&
|
|
conf->antenna_sel_tx != active_ant->tx)
|
|
flags |= CONFIG_UPDATE_ANTENNA;
|
|
else if (active_ant->tx == ANTENNA_SW_DIVERSITY)
|
|
flags |= CONFIG_UPDATE_ANTENNA;
|
|
|
|
/*
|
|
* The following configuration options are never
|
|
* stored anywhere and will always be updated.
|
|
*/
|
|
flags |= CONFIG_UPDATE_SLOT_TIME;
|
|
flags |= CONFIG_UPDATE_BEACON_INT;
|
|
|
|
/*
|
|
* We have determined what options should be updated,
|
|
* now precalculate device configuration values depending
|
|
* on what configuration options need to be updated.
|
|
*/
|
|
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;
|
|
}
|
|
|
|
if (flags & CONFIG_UPDATE_CHANNEL) {
|
|
memcpy(&libconf.rf,
|
|
&rt2x00dev->spec.channels[conf->channel_val],
|
|
sizeof(libconf.rf));
|
|
}
|
|
|
|
if (flags & CONFIG_UPDATE_ANTENNA) {
|
|
if (conf->antenna_sel_rx)
|
|
libconf.ant.rx = conf->antenna_sel_rx;
|
|
else if (default_ant->rx != ANTENNA_SW_DIVERSITY)
|
|
libconf.ant.rx = default_ant->rx;
|
|
else if (active_ant->rx == ANTENNA_SW_DIVERSITY)
|
|
libconf.ant.rx = ANTENNA_B;
|
|
|
|
if (conf->antenna_sel_tx)
|
|
libconf.ant.tx = conf->antenna_sel_tx;
|
|
else if (default_ant->tx != ANTENNA_SW_DIVERSITY)
|
|
libconf.ant.tx = default_ant->tx;
|
|
else if (active_ant->tx == ANTENNA_SW_DIVERSITY)
|
|
libconf.ant.tx = ANTENNA_B;
|
|
}
|
|
|
|
if (flags & CONFIG_UPDATE_SLOT_TIME) {
|
|
short_slot_time = conf->flags & IEEE80211_CONF_SHORT_SLOT_TIME;
|
|
|
|
libconf.slot_time =
|
|
short_slot_time ? SHORT_SLOT_TIME : SLOT_TIME;
|
|
libconf.sifs = SIFS;
|
|
libconf.pifs = short_slot_time ? SHORT_PIFS : PIFS;
|
|
libconf.difs = short_slot_time ? SHORT_DIFS : DIFS;
|
|
libconf.eifs = EIFS;
|
|
}
|
|
|
|
libconf.conf = conf;
|
|
|
|
/*
|
|
* Start configuration.
|
|
*/
|
|
rt2x00dev->ops->lib->config(rt2x00dev, flags, &libconf);
|
|
|
|
/*
|
|
* Some configuration changes affect the link quality
|
|
* which means we need to reset the link tuner.
|
|
*/
|
|
if (flags & (CONFIG_UPDATE_CHANNEL | CONFIG_UPDATE_ANTENNA))
|
|
rt2x00lib_reset_link_tuner(rt2x00dev);
|
|
|
|
if (flags & CONFIG_UPDATE_PHYMODE) {
|
|
rt2x00dev->curr_hwmode = libconf.phymode;
|
|
rt2x00dev->rx_status.phymode = conf->phymode;
|
|
}
|
|
|
|
rt2x00dev->rx_status.freq = conf->freq;
|
|
rt2x00dev->rx_status.channel = conf->channel;
|
|
rt2x00dev->tx_power = conf->power_level;
|
|
|
|
if (flags & CONFIG_UPDATE_ANTENNA) {
|
|
rt2x00dev->link.ant.active.rx = libconf.ant.rx;
|
|
rt2x00dev->link.ant.active.tx = libconf.ant.tx;
|
|
}
|
|
}
|