Commit 3ec6697e authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

wifi: iwlwifi: mvm: adopt the latest firmware API 



The firmware no longer wants the beacon template inside the MAC command.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230417113648.92aed4180a06.I277efa343c88081cb3fc890dcbeae3161cdffe16@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f22c0bff

drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h

+0 −10
Original line number Diff line number Diff line
@@ -223,15 +223,6 @@ struct iwl_mac_client_data { 
	__le32 ctwin;

} __packed; /* MAC_CONTEXT_CONFIG_CLIENT_DATA_API_S_VER_1 */



/**

 * struct iwl_mac_go_ibss_data - configuration data for GO and IBSS MAC context

 *

 * @beacon_template: beacon template ID

 */

struct iwl_mac_go_ibss_data {

	__le32 beacon_template;

} __packed; /* MAC_CONTEXT_CONFIG_GO_IBSS_DATA_API_S_VER_1 */



/**

 * struct iwl_mac_p2p_dev_data  - configuration data for P2P device MAC context

 *
@@ -304,7 +295,6 @@ struct iwl_mac_config_cmd { 
	/* MAC_CONTEXT_CONFIG_SPECIFIC_DATA_API_U_VER_1 */

	union {

		struct iwl_mac_client_data client;

		struct iwl_mac_go_ibss_data go_ibss;

		struct iwl_mac_p2p_dev_data p2p_dev;

	};

} __packed; /* MAC_CONTEXT_CONFIG_CMD_API_S_VER_1 */

drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c

+0 −7
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ static int iwl_mvm_mld_mac_ctxt_cmd_ibss(struct iwl_mvm *mvm, 
					 struct ieee80211_vif *vif,

					 u32 action)

{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	struct iwl_mac_config_cmd cmd = {};



	WARN_ON(vif->type != NL80211_IFTYPE_ADHOC);
@@ -178,9 +177,6 @@ static int iwl_mvm_mld_mac_ctxt_cmd_ibss(struct iwl_mvm *mvm, 
				       MAC_CFG_FILTER_ACCEPT_PROBE_REQ |

				       MAC_CFG_FILTER_ACCEPT_GRP);



	/* TODO: Assumes that the beacon id == mac context id */

	cmd.go_ibss.beacon_template = cpu_to_le32(mvmvif->id);



	return iwl_mvm_mld_mac_ctxt_send_cmd(mvm, &cmd);

}
@@ -220,9 +216,6 @@ static int iwl_mvm_mld_mac_ctxt_cmd_ap_go(struct iwl_mvm *mvm, 
						 MAC_CFG_FILTER_ACCEPT_PROBE_REQ,

						 MAC_CFG_FILTER_ACCEPT_BEACON);



	/* TODO: Assume that the beacon id == mac context id */

	cmd.go_ibss.beacon_template = cpu_to_le32(mvmvif->id);



	return iwl_mvm_mld_mac_ctxt_send_cmd(mvm, &cmd);

}