diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-08-30 06:12:00 -0700 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-09-11 08:51:10 -0700 |
| commit | 27eafdda7714d5b189c175e71ab22c72c90ba93e (patch) | |
| tree | fca29693071bda69d1eec4d3bda02d73a5f0eded /drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | |
| parent | 6e6ebf4befa75ebdf28130d0135f3ad3aadc02f8 (diff) | |
| download | kernel_samsung_smdk4412-27eafdda7714d5b189c175e71ab22c72c90ba93e.zip kernel_samsung_smdk4412-27eafdda7714d5b189c175e71ab22c72c90ba93e.tar.gz kernel_samsung_smdk4412-27eafdda7714d5b189c175e71ab22c72c90ba93e.tar.bz2 | |
iwlwifi: fix PAN parameters while scanning
When only the PAN side was active, we gave no
time to the WLAN context, which is OK unless
we are scanning, which always happens on the
WLAN context. Fix this.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c index 6fb52ab..d03ba6a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c @@ -331,6 +331,11 @@ static int iwlagn_set_pan_params(struct iwl_priv *priv) slot1 = max_t(int, 1, ctx_pan->vif->bss_conf.dtim_period) * ctx_pan->vif->bss_conf.beacon_int; slot1 = max_t(int, 100, slot1); + + if (test_bit(STATUS_SCAN_HW, &priv->status)) { + slot0 = slot1 * 3 - 20; + slot1 = 20; + } } cmd.slots[0].width = cpu_to_le16(slot0); |