Skip to content

Commit

Permalink
wifi: iwlwifi: rename iwl_datapath_monitor_notif::mac_id to link_id
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Miri Korenblit authored and Johannes Berg committed Jan 13, 2025
1 parent c0cf30b commit 14d00d7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
3 changes: 2 additions & 1 deletion drivers/net/wireless/intel/iwlwifi/mvm/ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 14d00d7

Please sign in to comment.