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

Commit 3083d03c authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlagn: alwasy send RXON with disassociate falge before associate 



Before send the RXON command with associated flag set, always do disassociate
first to make sure uCode is in the correct state.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent dd5c940b

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

+3 −5
Original line number Diff line number Diff line
@@ -389,11 +389,9 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) 
	 * AP station must be done after the BSSID is set to correctly

	 * set up filters in the device.

	 */

	if ((old_assoc && new_assoc) || !new_assoc) {

	ret = iwlagn_rxon_disconn(priv, ctx);

	if (ret)

		return ret;

	}



	if (new_assoc)

		return iwlagn_rxon_connect(priv, ctx);

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

+5 −0
Original line number Diff line number Diff line
@@ -582,6 +582,11 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) 
	int trace_idx;

#endif



	if (test_bit(STATUS_FW_ERROR, &priv->status)) {

		IWL_WARN(priv, "fw recovery, no hcmd send\n");

		return -EIO;

	}



	copy_size = sizeof(out_cmd->hdr);

	cmd_size = sizeof(out_cmd->hdr);