DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Add radio_work_is_connect() helper

Browse source 
This avoids duplicated code to check for different types of connection
radio work items.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2017-02-07 23:55:48 +02:00 committed by Jouni Malinen
parent 85b6b6b6e1
commit 4c6f450cad
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
wpa_supplicant/wpa_supplicant.c
View file

@ -4367,6 +4367,13 @@ static void radio_work_free(struct wpa_radio_work *work)
} }
static int radio_work_is_connect(struct wpa_radio_work *work)
{
return os_strcmp(work->type, "sme-connect") == 0 ||
os_strcmp(work->type, "connect") == 0;
}
static int radio_work_is_scan(struct wpa_radio_work *work) static int radio_work_is_scan(struct wpa_radio_work *work)
{ {
return os_strcmp(work->type, "scan") == 0 || return os_strcmp(work->type, "scan") == 0 ||
@ -4403,8 +4410,7 @@ static struct wpa_radio_work * radio_work_get_next_work(struct wpa_radio *radio)
return NULL; return NULL;
} }
if (os_strcmp(active_work->type, "sme-connect") == 0 || if (radio_work_is_connect(active_work)) {
os_strcmp(active_work->type, "connect") == 0) {
/* /*
* If the active work is either connect or sme-connect, * If the active work is either connect or sme-connect,
* do not parallelize them with other radio works. * do not parallelize them with other radio works.
@ -4423,8 +4429,7 @@ static struct wpa_radio_work * radio_work_get_next_work(struct wpa_radio *radio)
* If connect or sme-connect are enqueued, parallelize only * If connect or sme-connect are enqueued, parallelize only
* those operations ahead of them in the queue. * those operations ahead of them in the queue.
*/ */
if (os_strcmp(tmp->type, "connect") == 0 || if (radio_work_is_connect(tmp))
os_strcmp(tmp->type, "sme-connect") == 0)
break; break;
/* Serialize parallel scan and p2p_scan operations on the same /* Serialize parallel scan and p2p_scan operations on the same