|
@@ -126,11 +126,6 @@ void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
|
|
* ANTENNA_SW_DIVERSITY state to the driver.
|
|
* ANTENNA_SW_DIVERSITY state to the driver.
|
|
* If that happens, fallback to hardware defaults,
|
|
* If that happens, fallback to hardware defaults,
|
|
* or our own default.
|
|
* or our own default.
|
|
- * If diversity handling is active for a particular antenna,
|
|
|
|
- * we shouldn't overwrite that antenna.
|
|
|
|
- * 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->flags & ANTENNA_RX_DIVERSITY))
|
|
if (!(ant->flags & ANTENNA_RX_DIVERSITY))
|
|
config.rx = rt2x00lib_config_antenna_check(config.rx, def->rx);
|
|
config.rx = rt2x00lib_config_antenna_check(config.rx, def->rx);
|
|
@@ -142,9 +137,6 @@ void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
|
|
else
|
|
else
|
|
config.tx = active->tx;
|
|
config.tx = active->tx;
|
|
|
|
|
|
- if (config.rx == active->rx && config.tx == active->tx)
|
|
|
|
- return;
|
|
|
|
-
|
|
|
|
/*
|
|
/*
|
|
* Antenna setup changes require the RX to be disabled,
|
|
* Antenna setup changes require the RX to be disabled,
|
|
* else the changes will be ignored by the device.
|
|
* else the changes will be ignored by the device.
|