summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg2011-09-23 00:14:55 +0200
committerJohn W. Linville2011-09-27 20:34:08 +0200
commit325a7ddf7b27ed3ded3d7fb7c3313266e510a978 (patch)
tree69675f6401c4332894ed92e5f019e6a2de9b383a
parentiwlagn: fix dangling scan request (diff)
downloadkernel-qcow2-linux-325a7ddf7b27ed3ded3d7fb7c3313266e510a978.tar.gz
kernel-qcow2-linux-325a7ddf7b27ed3ded3d7fb7c3313266e510a978.tar.xz
kernel-qcow2-linux-325a7ddf7b27ed3ded3d7fb7c3313266e510a978.zip
iwlagn: fix slot programming
When an AP mode interface is added with a DTIM period of two, the slot programming is wrong. Fix it by taking into account the DTIM period. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-rxon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 00e6fc59e459..ca632f9b1cc8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -370,7 +370,7 @@ int iwlagn_set_pan_params(struct iwl_priv *priv)
slot1 = IWL_MIN_SLOT_TIME;
} else if (!ctx_pan->vif->bss_conf.idle &&
!ctx_pan->vif->bss_conf.assoc) {
- slot1 = bcnint * 3 - IWL_MIN_SLOT_TIME;
+ slot1 = dtim * bcnint * 3 - IWL_MIN_SLOT_TIME;
slot0 = IWL_MIN_SLOT_TIME;
}
} else if (ctx_pan->vif) {