diff options
Diffstat (limited to 'drivers/net/wireless/p54/p54common.c')
-rw-r--r-- | drivers/net/wireless/p54/p54common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c index b1dc10ccd32c..b3e75eb4d5ba 100644 --- a/drivers/net/wireless/p54/p54common.c +++ b/drivers/net/wireless/p54/p54common.c | |||
@@ -1198,8 +1198,7 @@ static int p54_config(struct ieee80211_hw *dev, struct ieee80211_conf *conf) | |||
1198 | struct p54_common *priv = dev->priv; | 1198 | struct p54_common *priv = dev->priv; |
1199 | 1199 | ||
1200 | mutex_lock(&priv->conf_mutex); | 1200 | mutex_lock(&priv->conf_mutex); |
1201 | priv->rx_antenna = (conf->antenna_sel_rx == 0) ? | 1201 | priv->rx_antenna = 2; /* automatic */ |
1202 | 2 : conf->antenna_sel_tx - 1; | ||
1203 | priv->output_power = conf->power_level << 2; | 1202 | priv->output_power = conf->power_level << 2; |
1204 | ret = p54_set_freq(dev, cpu_to_le16(conf->channel->center_freq)); | 1203 | ret = p54_set_freq(dev, cpu_to_le16(conf->channel->center_freq)); |
1205 | p54_set_vdcf(dev); | 1204 | p54_set_vdcf(dev); |