iwlwifi-5000: adjust antennas names in 5000 HW family

This patch use new defines for antennas

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 1a18ac187cb5..8bccd9056bfb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -263,19 +263,15 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)
                 priv->hw_params.tx_chains_num = 1;
                 priv->hw_params.rx_chains_num = 2;
                 /* FIXME: move to ANT_A, ANT_B, ANT_C enum */
-                priv->hw_params.valid_tx_ant = IWL_ANTENNA_MAIN;
-                priv->hw_params.valid_rx_ant = (IWL_ANTENNA_MAIN |
-                                                IWL_ANTENNA_AUX);
+                priv->hw_params.valid_tx_ant = ANT_A;
+                priv->hw_params.valid_rx_ant = ANT_AB;
                 break;
         case CSR_HW_REV_TYPE_5300:
         case CSR_HW_REV_TYPE_5350:
                 priv->hw_params.tx_chains_num = 3;
                 priv->hw_params.rx_chains_num = 3;
-                /* FIXME: move to ANT_A, ANT_B, ANT_C enum */
-                priv->hw_params.valid_tx_ant = (IWL_ANTENNA_MAIN |
-                                                IWL_ANTENNA_AUX | 0x04);
-                priv->hw_params.valid_rx_ant = (IWL_ANTENNA_MAIN |
-                                                IWL_ANTENNA_AUX | 0x04);
+                priv->hw_params.valid_tx_ant = ANT_ABC;
+                priv->hw_params.valid_rx_ant = ANT_ABC;
                 break;
         }