Commit 6905eb1c authored by Nathan Errera's avatar Nathan Errera Committed by Luca Coelho
Browse files

iwlwifi: rename CHANNEL_SWITCH_NOA_NOTIF to CHANNEL_SWITCH_START_NOTIF 



There is no relation between the name and the purpose of the
notification. This notification is sent from FW when the channel switch
starts.

Signed-off-by: default avatarNathan Errera <nathan.errera@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211024181719.24b71b0cb741.I97deb70e18f259de51395a1e7c7e58c7b006c317@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent cf7a7457

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

+5 −5
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/*

 * Copyright (C) 2012-2014, 2018-2019 Intel Corporation

 * Copyright (C) 2012-2014, 2018-2019, 2021 Intel Corporation

 * Copyright (C) 2013-2015 Intel Mobile Communications GmbH

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 */
@@ -39,9 +39,9 @@ enum iwl_mac_conf_subcmd_ids { 
	PROBE_RESPONSE_DATA_NOTIF = 0xFC,



	/**

	 * @CHANNEL_SWITCH_NOA_NOTIF: &struct iwl_channel_switch_noa_notif

	 * @CHANNEL_SWITCH_START_NOTIF: &struct iwl_channel_switch_start_notif

	 */

	CHANNEL_SWITCH_NOA_NOTIF = 0xFF,

	CHANNEL_SWITCH_START_NOTIF = 0xFF,

};



#define IWL_P2P_NOA_DESC_COUNT	(2)
@@ -102,11 +102,11 @@ struct iwl_missed_vap_notif { 
} __packed; /* MISSED_VAP_NTFY_API_S_VER_1 */



/**

 * struct iwl_channel_switch_noa_notif - Channel switch NOA notification

 * struct iwl_channel_switch_start_notif - Channel switch start notification

 *

 * @id_and_color: ID and color of the MAC

 */

struct iwl_channel_switch_noa_notif {

struct iwl_channel_switch_start_notif {

	__le32 id_and_color;

} __packed; /* CHANNEL_SWITCH_START_NTFY_API_S_VER_1 */

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

+3 −3
Original line number Diff line number Diff line
@@ -1557,11 +1557,11 @@ void iwl_mvm_probe_resp_data_notif(struct iwl_mvm *mvm, 
		ieee80211_beacon_set_cntdwn(vif, notif->csa_counter);

}



void iwl_mvm_channel_switch_noa_notif(struct iwl_mvm *mvm,

void iwl_mvm_channel_switch_start_notif(struct iwl_mvm *mvm,

					struct iwl_rx_cmd_buffer *rxb)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_channel_switch_noa_notif *notif = (void *)pkt->data;

	struct iwl_channel_switch_start_notif *notif = (void *)pkt->data;

	struct ieee80211_vif *csa_vif, *vif;

	struct iwl_mvm_vif *mvmvif;

	u32 id_n_color, csa_id, mac_id;

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+2 −2
Original line number Diff line number Diff line
@@ -1658,7 +1658,7 @@ void iwl_mvm_probe_resp_data_notif(struct iwl_mvm *mvm, 
				   struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_rx_missed_vap_notif(struct iwl_mvm *mvm,

				 struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_channel_switch_noa_notif(struct iwl_mvm *mvm,

void iwl_mvm_channel_switch_start_notif(struct iwl_mvm *mvm,

					struct iwl_rx_cmd_buffer *rxb);

/* Bindings */

int iwl_mvm_binding_add_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif);

drivers/net/wireless/intel/iwlwifi/mvm/ops.c

+4 −4
Original line number Diff line number Diff line
@@ -383,9 +383,9 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = { 
		       iwl_mvm_probe_resp_data_notif,

		       RX_HANDLER_ASYNC_LOCKED,

		       struct iwl_probe_resp_data_notif),

	RX_HANDLER_GRP(MAC_CONF_GROUP, CHANNEL_SWITCH_NOA_NOTIF,

		       iwl_mvm_channel_switch_noa_notif,

		       RX_HANDLER_SYNC, struct iwl_channel_switch_noa_notif),

	RX_HANDLER_GRP(MAC_CONF_GROUP, CHANNEL_SWITCH_START_NOTIF,

		       iwl_mvm_channel_switch_start_notif,

		       RX_HANDLER_SYNC, struct iwl_channel_switch_start_notif),

	RX_HANDLER_GRP(DATA_PATH_GROUP, MONITOR_NOTIF,

		       iwl_mvm_rx_monitor_notif, RX_HANDLER_ASYNC_LOCKED,

		       struct iwl_datapath_monitor_notif),
@@ -511,7 +511,7 @@ static const struct iwl_hcmd_names iwl_mvm_mac_conf_names[] = { 
	HCMD_NAME(CHANNEL_SWITCH_TIME_EVENT_CMD),

	HCMD_NAME(SESSION_PROTECTION_CMD),

	HCMD_NAME(SESSION_PROTECTION_NOTIF),

	HCMD_NAME(CHANNEL_SWITCH_NOA_NOTIF),

	HCMD_NAME(CHANNEL_SWITCH_START_NOTIF),

};



/* Please keep this array *SORTED* by hex value.