From: Tomas Winkler Date: Thu, 24 Apr 2008 18:55:31 +0000 (-0700) Subject: iwlwifi-5000: adjust antennas names in 5000 HW family X-Git-Tag: v2.6.27-rc1~969^2~465 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1179f18df9fa3449ae6011042df50d9b9b012814;p=linux-2.6 iwlwifi-5000: adjust antennas names in 5000 HW family This patch use new defines for antennas Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index 1a18ac187c..8bccd9056b 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; }