Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 06:29:23 +01:00
Code Releases Activity

test-runner: Futher fix for the SETUP group support

Browse Source 
Drop a pointless asignment of has_hw_conf to false when it's already
false, fix index when accessing radio_conf_list.  Apparently the SETUP
group is not used in any of our test and wasn't tested itself so could
as well have removed the code.
This commit is contained in:
Andrew Zaborowski 2019-04-20 22:28:59 +02:00 committed by Denis Kenzior
parent 1462d68eb6
commit 20faa37467
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/test-runner.c
View File

@ -1014,7 +1014,7 @@ static bool configure_hw_radios(struct l_settings *hw_settings,
struct l_queue *wiphy_list) struct l_queue *wiphy_list)
{ {
char **radio_conf_list; char **radio_conf_list;
int i, num_radios_requested, num_radios_created; int num_radios_requested, num_radios_created;
bool status = false; bool status = false;
bool has_hw_conf; bool has_hw_conf;
@ -1041,6 +1041,8 @@ static bool configure_hw_radios(struct l_settings *hw_settings,
} }
if (has_hw_conf) { if (has_hw_conf) {
int i;
for (i = 0; radio_conf_list[i]; i++) { for (i = 0; radio_conf_list[i]; i++) {
size_t len = strlen(radio_conf_list[i]); size_t len = strlen(radio_conf_list[i]);
@ -1072,7 +1074,6 @@ static bool configure_hw_radios(struct l_settings *hw_settings,
} }
num_radios_created = 0; num_radios_created = 0;
i = 0;
while (num_radios_requested > num_radios_created) { while (num_radios_requested > num_radios_created) {
struct wiphy *wiphy; struct wiphy *wiphy;
@ -1088,13 +1089,11 @@ static bool configure_hw_radios(struct l_settings *hw_settings,
p2p_device = true; p2p_device = true;
use_chanctx = true; use_chanctx = true;
has_hw_conf = false;
sprintf(wiphy->name, "rad%d", num_radios_created); sprintf(wiphy->name, "rad%d", num_radios_created);
goto configure; goto configure;
} }
strcpy(wiphy->name, radio_conf_list[i]); strcpy(wiphy->name, radio_conf_list[num_radios_created]);
if (!l_settings_get_uint(hw_settings, wiphy->name, if (!l_settings_get_uint(hw_settings, wiphy->name,
HW_CONFIG_PHY_CHANNELS, &channels)) HW_CONFIG_PHY_CHANNELS, &channels))