diff options
| author | Chatre, Reinette <reinette.chatre@intel.com> | 2008-11-12 16:14:07 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-11-25 16:41:18 -0500 |
| commit | dbce56a456f6d6302a77107088340828dcaf9a02 (patch) | |
| tree | 39606c6c5a2fa77951793e46656b7d54252156cb | |
| parent | 417f114bf2efa6183477a75da272c0d452e1cda3 (diff) | |
iwlwifi: replace magic constants with define
use IWL_CCK_RATES_MASK and IWL_OFDM_RATES_MASK instead of
their values directly.
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
cc: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 03acad24f677..ab599a962874 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
| @@ -466,9 +466,9 @@ static u8 iwl_rate_get_lowest_plcp(struct iwl_priv *priv) | |||
| 466 | 466 | ||
| 467 | /* Set rate mask*/ | 467 | /* Set rate mask*/ |
| 468 | if (priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK) | 468 | if (priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK) |
| 469 | rate_mask = priv->active_rate_basic & 0xF; | 469 | rate_mask = priv->active_rate_basic & IWL_CCK_RATES_MASK; |
| 470 | else | 470 | else |
| 471 | rate_mask = priv->active_rate_basic & 0xFF0; | 471 | rate_mask = priv->active_rate_basic & IWL_OFDM_RATES_MASK; |
| 472 | 472 | ||
| 473 | /* Find lowest valid rate */ | 473 | /* Find lowest valid rate */ |
| 474 | for (i = IWL_RATE_1M_INDEX; i != IWL_RATE_INVALID; | 474 | for (i = IWL_RATE_1M_INDEX; i != IWL_RATE_INVALID; |
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 18d2a2a68959..1a923c2fddb0 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
| @@ -1425,9 +1425,9 @@ static u8 iwl3945_rate_get_lowest_plcp(struct iwl3945_priv *priv) | |||
| 1425 | 1425 | ||
| 1426 | /* Set rate mask*/ | 1426 | /* Set rate mask*/ |
| 1427 | if (priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK) | 1427 | if (priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK) |
| 1428 | rate_mask = priv->active_rate_basic & 0xF; | 1428 | rate_mask = priv->active_rate_basic & IWL_CCK_RATES_MASK; |
| 1429 | else | 1429 | else |
| 1430 | rate_mask = priv->active_rate_basic & 0xFF0; | 1430 | rate_mask = priv->active_rate_basic & IWL_OFDM_RATES_MASK; |
| 1431 | 1431 | ||
| 1432 | for (i = IWL_RATE_1M_INDEX; i != IWL_RATE_INVALID; | 1432 | for (i = IWL_RATE_1M_INDEX; i != IWL_RATE_INVALID; |
| 1433 | i = iwl3945_rates[i].next_ieee) { | 1433 | i = iwl3945_rates[i].next_ieee) { |