diff mbox series

[v3,11/46] PR: Use stored capabilities instead of driver flags

Message ID 20260513100010.1947710-12-kavita.kavita@oss.qualcomm.com
State Accepted
Headers show
Series PR: Add nl80211 support and ranging for Proximity Detection | expand

Commit Message

Kavita Kavita May 13, 2026, 9:59 a.m. UTC 
From: Peddolla Harshavardhan Reddy <peddolla.reddy@oss.qualcomm.com>

When driver flags were initially added to determine EDCA and NTB support
for ISTA and RSTA roles, they were not being set anywhere in the code.
Now that we parse and store PMSR capabilities from the driver in nested
structs (ista, rsta), use those stored capabilities directly instead of
relying on driver flags.

Replace driver flag checks:
- WPA_DRIVER_FLAGS2_FTM_INITIATOR -> capa->ista.support_edca
- WPA_DRIVER_FLAGS_FTM_RESPONDER -> capa->rsta.support_edca
- WPA_DRIVER_FLAGS2_NON_TRIGGER_BASED_INITIATOR -> capa->ista.support_ntb
- WPA_DRIVER_FLAGS2_NON_TRIGGER_BASED_RESPONDER -> capa->rsta.support_ntb

Fixes: f45cc220e4bb ("PR: Update PR device configs and capabilities from driver")
Signed-off-by: Peddolla Harshavardhan Reddy <peddolla.reddy@oss.qualcomm.com>
---
 wpa_supplicant/pr_supplicant.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/wpa_supplicant/pr_supplicant.c b/wpa_supplicant/pr_supplicant.c
index 0af25f5d4..544656bb3 100644
--- a/wpa_supplicant/pr_supplicant.c
+++ b/wpa_supplicant/pr_supplicant.c
@@ -350,10 +350,8 @@  int wpas_pr_init(struct wpa_global *global, struct wpa_supplicant *wpa_s,
 	pr.pasn_type = wpa_s->conf->pr_pasn_type;
 	pr.preferred_ranging_role = wpa_s->conf->pr_preferred_role;
 
-	pr.edca_ista_support = wpa_s->drv_flags2 &
-		WPA_DRIVER_FLAGS2_FTM_INITIATOR;
-	pr.edca_rsta_support = wpa_s->drv_flags &
-		WPA_DRIVER_FLAGS_FTM_RESPONDER;
+	pr.edca_ista_support = capa->ista.support_edca;
+	pr.edca_rsta_support = capa->rsta.support_edca;
 	pr.edca_format_and_bw = capa->edca_format_and_bw;
 	pr.max_rx_antenna = capa->max_rx_antenna;
 	pr.max_tx_antenna = capa->max_tx_antenna;
@@ -361,10 +359,8 @@  int wpas_pr_init(struct wpa_global *global, struct wpa_supplicant *wpa_s,
 	wpas_pr_setup_edca_channels(wpa_s, &pr.edca_channels,
 				    pr.edca_format_and_bw);
 
-	pr.ntb_ista_support = wpa_s->drv_flags2 &
-		WPA_DRIVER_FLAGS2_NON_TRIGGER_BASED_INITIATOR;
-	pr.ntb_rsta_support = wpa_s->drv_flags2 &
-		WPA_DRIVER_FLAGS2_NON_TRIGGER_BASED_RESPONDER;
+	pr.ntb_ista_support = capa->ista.support_ntb;
+	pr.ntb_rsta_support = capa->rsta.support_ntb;
 	pr.ntb_format_and_bw = capa->ntb_format_and_bw;
 	pr.max_tx_ltf_repetations = capa->max_tx_ltf_repetations;
 	pr.max_rx_ltf_repetations = capa->max_rx_ltf_repetations;