Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

iwlagn: send RXON timing before associating 



The PAN functionality requires us to send the
timing including a valid DTIM period to the
microcode before associating, so request this
data from mac80211 and send it to the device.

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

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

+16 −0
Original line number Diff line number Diff line
@@ -182,6 +182,21 @@ int iwl_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) 


	iwl_set_rxon_hwcrypto(priv, ctx, !priv->cfg->mod_params->sw_crypto);



	if (new_assoc) {

		if (WARN_ON(!ctx->vif))

			return -EINVAL;

		/*

		 * First of all, before setting associated, we need to

		 * send RXON timing so the device knows about the DTIM

		 * period and other timing values

		 */

		ret = iwl_send_rxon_timing(priv, ctx->vif);

		if (ret) {

			IWL_ERR(priv, "Error setting RXON timing!\n");

			return ret;

		}

	}



	/* Apply the new configuration

	 * RXON unassoc clears the station table in uCode so restoration of

	 * stations is needed after it (the RXON command) completes
@@ -3355,6 +3370,7 @@ static int iwl_mac_setup_register(struct iwl_priv *priv, 
	/* Tell mac80211 our characteristics */

	hw->flags = IEEE80211_HW_SIGNAL_DBM |

		    IEEE80211_HW_AMPDU_AGGREGATION |

		    IEEE80211_HW_NEED_DTIM_PERIOD |

		    IEEE80211_HW_SPECTRUM_MGMT;



	if (!priv->cfg->broken_powersave)

drivers/net/wireless/iwlwifi/iwl-core.c

+2 −0
Original line number Diff line number Diff line
@@ -536,6 +536,8 @@ int iwl_send_rxon_timing(struct iwl_priv *priv, struct ieee80211_vif *vif) 
	rem = do_div(tsf, interval_tm);

	ctx->timing.beacon_init_val = cpu_to_le32(interval_tm - rem);



	ctx->timing.dtim_period = vif->bss_conf.dtim_period;



	IWL_DEBUG_ASSOC(priv,

			"beacon interval %d beacon timer %d beacon tim %d\n",

			le16_to_cpu(ctx->timing.beacon_interval),