aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl3945-base.c
diff options
context:
space:
mode:
authorWinkler, Tomas <tomas.winkler@intel.com>2009-01-23 16:45:21 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 16:01:38 -0500
commit0d21044effa10044930419c6f837f75191229c3a (patch)
treec5d460adc539f02356bae2df36be1d5f00ec47ca /drivers/net/wireless/iwlwifi/iwl3945-base.c
parent17f841cd6cb0837ba0599ad18a746c30ddd83e08 (diff)
iwlwifi: fix probe mask for 39 scan API
This pach make use of 39 own scan probe mask the variables or of different types Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index d09325591de0..25a350810a10 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -3267,12 +3267,12 @@ static int iwl3945_get_channels_for_scan(struct iwl_priv *priv,
3267 * hearing clear Rx packet).*/ 3267 * hearing clear Rx packet).*/
3268 if (IWL_UCODE_API(priv->ucode_ver) >= 2) { 3268 if (IWL_UCODE_API(priv->ucode_ver) >= 2) {
3269 if (n_probes) 3269 if (n_probes)
3270 scan_ch->type |= IWL_SCAN_PROBE_MASK(n_probes); 3270 scan_ch->type |= IWL39_SCAN_PROBE_MASK(n_probes);
3271 } else { 3271 } else {
3272 /* uCode v1 does not allow setting direct probe bits on 3272 /* uCode v1 does not allow setting direct probe bits on
3273 * passive channel. */ 3273 * passive channel. */
3274 if ((scan_ch->type & 1) && n_probes) 3274 if ((scan_ch->type & 1) && n_probes)
3275 scan_ch->type |= IWL_SCAN_PROBE_MASK(n_probes); 3275 scan_ch->type |= IWL39_SCAN_PROBE_MASK(n_probes);
3276 } 3276 }
3277 3277
3278 /* Set txpower levels to defaults */ 3278 /* Set txpower levels to defaults */