[PATCH 2/3] scan: set scan priority via scan_common

[PATCH 2/3] scan: set scan priority via scan_common

[James Prestwood]

[-- Attachment #1: Type: text/plain, Size: 2998 bytes --]

This adds a priority argument to scan_common rather than hard
coding it when inserting the work item
---
 src/scan.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/scan.c b/src/scan.c
index 54159dfd..96907e59 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -52,6 +52,8 @@
 #include "src/band.h"
 #include "src/scan.h"
 
+#define SCAN_WORK_PRIORITY 2
+
 /* User configurable options */
 static double RANK_5G_FACTOR;
 static uint32_t SCAN_MAX_INTERVAL;
@@ -607,6 +609,7 @@ static struct scan_request *scan_request_new(struct scan_context *sc,
 
 static uint32_t scan_common(uint64_t wdev_id, bool passive,
 				const struct scan_parameters *params,
+				int priority,
 				scan_trigger_func_t trigger,
 				scan_notify_func_t notify, void *userdata,
 				scan_destroy_func_t destroy)
@@ -625,7 +628,8 @@ static uint32_t scan_common(uint64_t wdev_id, bool passive,
 
 	l_queue_push_tail(sc->requests, sr);
 
-	return wiphy_radio_work_insert(sc->wiphy, &sr->work, 2, &work_ops);
+	return wiphy_radio_work_insert(sc->wiphy, &sr->work,
+					priority, &work_ops);
 }
 
 uint32_t scan_passive(uint64_t wdev_id, struct scan_freq_set *freqs,
@@ -634,8 +638,8 @@ uint32_t scan_passive(uint64_t wdev_id, struct scan_freq_set *freqs,
 {
 	struct scan_parameters params = { .freqs = freqs };
 
-	return scan_common(wdev_id, true, &params, trigger, notify,
-							userdata, destroy);
+	return scan_common(wdev_id, true, &params, SCAN_WORK_PRIORITY, trigger,
+				notify, userdata, destroy);
 }
 
 uint32_t scan_passive_full(uint64_t wdev_id,
@@ -644,7 +648,7 @@ uint32_t scan_passive_full(uint64_t wdev_id,
 			scan_notify_func_t notify, void *userdata,
 			scan_destroy_func_t destroy)
 {
-	return scan_common(wdev_id, true, params, trigger,
+	return scan_common(wdev_id, true, params, SCAN_WORK_PRIORITY, trigger,
 				notify, userdata, destroy);
 }
 
@@ -658,7 +662,7 @@ uint32_t scan_active(uint64_t wdev_id, uint8_t *extra_ie, size_t extra_ie_size,
 	params.extra_ie = extra_ie;
 	params.extra_ie_size = extra_ie_size;
 
-	return scan_common(wdev_id, false, &params,
+	return scan_common(wdev_id, false, &params, SCAN_WORK_PRIORITY,
 					trigger, notify, userdata, destroy);
 }
 
@@ -667,7 +671,7 @@ uint32_t scan_active_full(uint64_t wdev_id,
 			scan_trigger_func_t trigger, scan_notify_func_t notify,
 			void *userdata, scan_destroy_func_t destroy)
 {
-	return scan_common(wdev_id, false, params,
+	return scan_common(wdev_id, false, params, SCAN_WORK_PRIORITY,
 					trigger, notify, userdata, destroy);
 }
 
@@ -795,7 +799,8 @@ uint32_t scan_owe_hidden(uint64_t wdev_id, struct l_queue *list,
 done:
 	l_queue_push_tail(sc->requests, sr);
 
-	return wiphy_radio_work_insert(sc->wiphy, &sr->work, 2, &work_ops);
+	return wiphy_radio_work_insert(sc->wiphy, &sr->work,
+					SCAN_WORK_PRIORITY, &work_ops);
 }
 
 bool scan_cancel(uint64_t wdev_id, uint32_t id)
-- 
2.31.1

Re: [PATCH 2/3] scan: set scan priority via scan_common

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 700 bytes --]

On 1/10/22 18:15, James Prestwood wrote:
> This adds a priority argument to scan_common rather than hard
> coding it when inserting the work item
> ---
>   src/scan.c | 19 ++++++++++++-------
>   1 file changed, 12 insertions(+), 7 deletions(-)
> 
> diff --git a/src/scan.c b/src/scan.c
> index 54159dfd..96907e59 100644
> --- a/src/scan.c
> +++ b/src/scan.c
> @@ -52,6 +52,8 @@
>   #include "src/band.h"
>   #include "src/scan.h"
>   
> +#define SCAN_WORK_PRIORITY 2

Can we name this SCAN_REQUEST_PRIORITY, or even simply REQUEST_PRIORITY?

Also, I wonder if we should put the priority numbers into wiphy.h instead of 
relying on hard-coded 1/2/3 everywhere.

Regards,
-Denis