diff options
| author | Johannes Berg | 2010-05-18 11:48:36 +0200 |
|---|---|---|
| committer | Reinette Chatre | 2010-06-06 08:19:44 +0200 |
| commit | 0e1654fa2b91324ab91019c7dfabf3518aca54dd (patch) | |
| tree | 6a04db2898f305c2c26dcc52070b67748ec6521b /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | iwlwifi: do not use huge command buffer for channel switch (diff) | |
| download | kernel-qcow2-linux-0e1654fa2b91324ab91019c7dfabf3518aca54dd.tar.gz kernel-qcow2-linux-0e1654fa2b91324ab91019c7dfabf3518aca54dd.tar.xz kernel-qcow2-linux-0e1654fa2b91324ab91019c7dfabf3518aca54dd.zip | |
iwlwifi: generic scan TX antenna forcing
In "iwlwifi: make scan antenna forcing more generic"
I introduced generic scan RX antenna forcing, which
here I rename to make it more evident. Also add scan
TX antenna forcing, since I will need that as well.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index a0e995ec453a..ac5fade28c8d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -367,7 +367,8 @@ static unsigned int iwl_hw_get_beacon_cmd(struct iwl_priv *priv, /* Set up packet rate and flags */ rate = iwl_rate_get_lowest_plcp(priv); - priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant); + priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant, + priv->hw_params.valid_tx_ant); rate_flags = iwl_ant_idx_to_flags(priv->mgmt_tx_ant); if ((rate >= IWL_FIRST_CCK_RATE) && (rate <= IWL_LAST_CCK_RATE)) rate_flags |= RATE_MCS_CCK_MSK; |