iwlagn: fix slot programming
authorJohannes Berg <johannes.berg@intel.com>
Thu, 22 Sep 2011 22:14:55 +0000 (15:14 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 27 Sep 2011 18:34:08 +0000 (14:34 -0400)
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>
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c

index 00e6fc5..ca632f9 100644 (file)
@@ -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) {