Commit efe54db8 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlagn: fix PAN slot timing wrt. DTIM 



When the DTIM is not 1, then the slot timing is in
some cases required to be calclulated based on the
DTIM interval instead of the beacon interval, fix
that.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 2b5f7a67

drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c

+3 −2
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ static int iwlagn_set_pan_params(struct iwl_priv *priv) 


	if (ctx_bss->vif && ctx_pan->vif) {

		int bcnint = ctx_pan->vif->bss_conf.beacon_int;

		int dtim = ctx_pan->vif->bss_conf.dtim_period ?: 1;



		/* should be set, but seems unused?? */

		cmd.flags |= cpu_to_le16(IWL_WIPAN_PARAMS_FLG_SLOTTED_MODE);
@@ -329,7 +330,7 @@ static int iwlagn_set_pan_params(struct iwl_priv *priv) 
		if (test_bit(STATUS_SCAN_HW, &priv->status) ||

		    (!ctx_bss->vif->bss_conf.idle &&

		     !ctx_bss->vif->bss_conf.assoc)) {

			slot0 = bcnint * 3 - 20;

			slot0 = dtim * bcnint * 3 - 20;

			slot1 = 20;

		} else if (!ctx_pan->vif->bss_conf.idle &&

			   !ctx_pan->vif->bss_conf.assoc) {