lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwlwifi: fix probe mask for 39 scan API

Browse Source 
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>
This commit is contained in:
Winkler, Tomas
2009-01-23 13:45:21 -08:00
committed by John W. Linville
parent 17f841cd6c
commit 0d21044eff
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/iwlwifi/iwl-commands.h
View File

@@ -2432,6 +2432,9 @@ struct iwl3945_scan_channel {
__le16 passive_dwell; /* in 1024-uSec TU (time units), typ 20-500 */ __le16 passive_dwell; /* in 1024-uSec TU (time units), typ 20-500 */
} __attribute__ ((packed)); } __attribute__ ((packed));
/* set number of direct probes u8 type */
#define IWL39_SCAN_PROBE_MASK(n) ((BIT(n) | (BIT(n) - BIT(1))))
struct iwl_scan_channel { struct iwl_scan_channel {
/* /*
* type is defined as: * type is defined as:
@@ -2448,6 +2451,9 @@ struct iwl_scan_channel {
__le16 passive_dwell; /* in 1024-uSec TU (time units), typ 20-500 */ __le16 passive_dwell; /* in 1024-uSec TU (time units), typ 20-500 */
} __attribute__ ((packed)); } __attribute__ ((packed));
/* set number of direct probes __le32 type */
#define IWL_SCAN_PROBE_MASK(n) cpu_to_le32((BIT(n) | (BIT(n) - BIT(1))))
/** /**
* struct iwl_ssid_ie - directed scan network information element * struct iwl_ssid_ie - directed scan network information element
* *

1
drivers/net/wireless/iwlwifi/iwl-core.h
View File

@@ -346,7 +346,6 @@ int iwl_send_scan_abort(struct iwl_priv *priv);
#define IWL_ACTIVE_QUIET_TIME __constant_cpu_to_le16(10) /* msec */ #define IWL_ACTIVE_QUIET_TIME __constant_cpu_to_le16(10) /* msec */
#define IWL_PLCP_QUIET_THRESH __constant_cpu_to_le16(1) /* packets */ #define IWL_PLCP_QUIET_THRESH __constant_cpu_to_le16(1) /* packets */
#define IWL_SCAN_PROBE_MASK(n) cpu_to_le32((BIT(n) | (BIT(n) - BIT(1))))
/******************************************************************************* /*******************************************************************************
* Calibrations - implemented in iwl-calib.c * Calibrations - implemented in iwl-calib.c

4
drivers/net/wireless/iwlwifi/iwl3945-base.c
View File

@@ -3267,12 +3267,12 @@ static int iwl3945_get_channels_for_scan(struct iwl_priv *priv,
* hearing clear Rx packet).*/ * hearing clear Rx packet).*/
if (IWL_UCODE_API(priv->ucode_ver) >= 2) { if (IWL_UCODE_API(priv->ucode_ver) >= 2) {
if (n_probes) if (n_probes)
scan_ch->type |= IWL_SCAN_PROBE_MASK(n_probes); scan_ch->type |= IWL39_SCAN_PROBE_MASK(n_probes);
} else { } else {
/* uCode v1 does not allow setting direct probe bits on /* uCode v1 does not allow setting direct probe bits on
* passive channel. */ * passive channel. */
if ((scan_ch->type & 1) && n_probes) if ((scan_ch->type & 1) && n_probes)
scan_ch->type |= IWL_SCAN_PROBE_MASK(n_probes); scan_ch->type |= IWL39_SCAN_PROBE_MASK(n_probes);
} }
/* Set txpower levels to defaults */ /* Set txpower levels to defaults */