wifi: iwlwifi: rename iwl_datapath_monitor_notif::mac_id to link_id

The FW really sends the link_id here. Rename it, while leaving a FIXME
in iwlmvm.

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

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h b/drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h
index 2ab38eaeb290be14cd740b55b3e1ea3ff77f3202..570a3f72251039df72286db6afe7b886aa8b7651 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h
@@ -391,7 +391,7 @@ enum iwl_datapath_monitor_notif_type {
 
 struct iwl_datapath_monitor_notif {
        __le32 type;
-       u8 mac_id;
+       u8 link_id;
        u8 reserved[3];
 } __packed; /* MONITOR_NTF_API_S_VER_1 */
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index f5ff700d06650e6198f3758c07a1af2a8e4d49a0..984f407f70272ab8d329012e6acec6426ebacde9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -208,7 +208,8 @@ static void iwl_mvm_rx_monitor_notif(struct iwl_mvm *mvm,
        if (notif->type != cpu_to_le32(IWL_DP_MON_NOTIF_TYPE_EXT_CCA))
                return;
 
-       vif = iwl_mvm_get_vif_by_macid(mvm, notif->mac_id);
+       /* FIXME: should fetch the link and not the vif */
+       vif = iwl_mvm_get_vif_by_macid(mvm, notif->link_id);
        if (!vif || vif->type != NL80211_IFTYPE_STATION)
                return;