Commit 9cbd5a8a authored by Gregory Greenman's avatar Gregory Greenman
Browse files

wifi: iwlwifi: mei: fix compilation errors in rfkill() 

The rfkill() callback was invoked with wrong parameters.
It was missed since MEI is defined now as depending on BROKEN.
Fix that.

Fixes: d288067e ("wifi: iwlwifi: mei: avoid blocking sap messages handling due to rtnl lock")
Fixes: 5aa7ce31 ("wifi: iwlwifi: mei: make sure ownership confirmed message is sent")
Fixes: 95170a46 ("wifi: iwlwifi: mei: don't send SAP commands if AMT is disabled")
Link: https://lore.kernel.org/r/20230126222821.305122-2-gregory.greenman@intel.com


Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
parent 09b4c35d

drivers/net/wireless/intel/iwlwifi/mei/main.c

+3 −3
Original line number Diff line number Diff line
@@ -788,7 +788,7 @@ static void iwl_mei_handle_amt_state(struct mei_cl_device *cldev, 
	if (mei->amt_enabled)

		iwl_mei_set_init_conf(mei);

	else if (iwl_mei_cache.ops)

		iwl_mei_cache.ops->rfkill(iwl_mei_cache.priv, false, false);

		iwl_mei_cache.ops->rfkill(iwl_mei_cache.priv, false);



	schedule_work(&mei->netdev_work);
@@ -829,7 +829,7 @@ static void iwl_mei_handle_csme_taking_ownership(struct mei_cl_device *cldev, 
		 */

		mei->csme_taking_ownership = true;



		iwl_mei_cache.ops->rfkill(iwl_mei_cache.priv, true, true);

		iwl_mei_cache.ops->rfkill(iwl_mei_cache.priv, true);

	} else {

		iwl_mei_send_sap_msg(cldev,

				     SAP_MSG_NOTIF_CSME_OWNERSHIP_CONFIRMED);
@@ -1774,7 +1774,7 @@ int iwl_mei_register(void *priv, const struct iwl_mei_ops *ops) 
			if (mei->amt_enabled)

				iwl_mei_send_sap_msg(mei->cldev,

						     SAP_MSG_NOTIF_WIFIDR_UP);

			ops->rfkill(priv, mei->link_prot_state, false);

			ops->rfkill(priv, mei->link_prot_state);

		}

	}

	ret = 0;