wifi: iwlwifi: STA command structure shouldn't be mvm specific

This strcuture is not specific to mvm, so rename it.

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Link: https://patch.msgid.link/20240901071542.39c9ceea41d3.I2a06bfca589c467fa84ad82ff86e73ec82e72a5e@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h b/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h
index 73586e547e57fb0f4db181829c077770d69394d1..6dd9401596e90adbb5f980844b777c4588ff3da3 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h
@@ -42,7 +42,7 @@ enum iwl_mac_conf_subcmd_ids {
         */
        LINK_CONFIG_CMD = 0x9,
        /**
-        * @STA_CONFIG_CMD: &struct iwl_mvm_sta_cfg_cmd
+        * @STA_CONFIG_CMD: &struct iwl_sta_cfg_cmd
         */
        STA_CONFIG_CMD = 0xA,
        /**
@@ -563,7 +563,7 @@ enum iwl_fw_sta_type {
 }; /* STATION_TYPE_E_VER_1 */
 
 /**
- * struct iwl_mvm_sta_cfg_cmd - cmd structure to add a peer sta to the uCode's
+ * struct iwl_sta_cfg_cmd - cmd structure to add a peer sta to the uCode's
  *     station table
  * ( STA_CONFIG_CMD = 0xA )
  *
@@ -595,7 +595,7 @@ enum iwl_fw_sta_type {
  *     capa
  * @htc_flags: which features are supported in HTC
  */
-struct iwl_mvm_sta_cfg_cmd {
+struct iwl_sta_cfg_cmd {
        __le32 sta_id;
        __le32 link_id;
        u8 peer_mld_address[ETH_ALEN];

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
index 071de9372843d0c76764b278ffd8cfe71ac33269..759b77d555b7eadc5347a186bd002b3e68613bdc 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
@@ -46,7 +46,7 @@ u32 iwl_mvm_sta_fw_id_mask(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
 }
 
 static int iwl_mvm_mld_send_sta_cmd(struct iwl_mvm *mvm,
-                                   struct iwl_mvm_sta_cfg_cmd *cmd)
+                                   struct iwl_sta_cfg_cmd *cmd)
 {
        int ret = iwl_mvm_send_cmd_pdu(mvm,
                                       WIDE_ID(MAC_CONF_GROUP, STA_CONFIG_CMD),
@@ -63,7 +63,7 @@ static int iwl_mvm_mld_add_int_sta_to_fw(struct iwl_mvm *mvm,
                                         struct iwl_mvm_int_sta *sta,
                                         const u8 *addr, int link_id)
 {
-       struct iwl_mvm_sta_cfg_cmd cmd;
+       struct iwl_sta_cfg_cmd cmd;
 
        lockdep_assert_held(&mvm->mutex);
 
@@ -438,7 +438,7 @@ static int iwl_mvm_mld_cfg_sta(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
        struct iwl_mvm_vif *mvm_vif = iwl_mvm_vif_from_mac80211(vif);
        struct iwl_mvm_vif_link_info *link_info =
                                        mvm_vif->link[link_conf->link_id];
-       struct iwl_mvm_sta_cfg_cmd cmd = {
+       struct iwl_sta_cfg_cmd cmd = {
                .sta_id = cpu_to_le32(mvm_link_sta->sta_id),
                .station_type = cpu_to_le32(mvm_sta->sta_type),
        };