Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

hwsim: add --no-register option 

Starts hwsim but does not register to mac80211_hwsim. This is to
allow autotests to disable hwsim, while still having the ability
to create/destroy radios over DBus.
This commit is contained in:
James Prestwood 2020-12-17 11:36:01 -08:00 committed by Denis Kenzior
parent 0193940e50
commit 554a78fbf0
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/hwsim.c
View File

@ -151,6 +151,7 @@ static enum action {
static bool no_vif_attr; static bool no_vif_attr;
static bool p2p_attr; static bool p2p_attr;
static bool no_register = false;
static const char *radio_name_attr; static const char *radio_name_attr;
static struct l_dbus *dbus; static struct l_dbus *dbus;
static struct l_queue *rules; static struct l_queue *rules;
@ -2347,6 +2348,9 @@ static void get_interface_done_initial(void *user_data)
{ {
struct l_genl_msg *msg; struct l_genl_msg *msg;
if (no_register)
return;
msg = l_genl_msg_new_sized(HWSIM_CMD_REGISTER, 4); msg = l_genl_msg_new_sized(HWSIM_CMD_REGISTER, 4);
l_genl_family_send(hwsim, msg, register_callback, NULL, NULL); l_genl_family_send(hwsim, msg, register_callback, NULL, NULL);
} }
@ -2625,6 +2629,7 @@ static const struct option main_options[] = {
{ "version", no_argument, NULL, 'v' }, { "version", no_argument, NULL, 'v' },
{ "iftype-disable", required_argument, NULL, 't' }, { "iftype-disable", required_argument, NULL, 't' },
{ "cipher-disable", required_argument, NULL, 'c' }, { "cipher-disable", required_argument, NULL, 'c' },
{ "no-register", no_argument, NULL, 'r' },
{ "help", no_argument, NULL, 'h' }, { "help", no_argument, NULL, 'h' },
{ } { }
}; };
@ -2636,7 +2641,7 @@ int main(int argc, char *argv[])
for (;;) { for (;;) {
int opt; int opt;
opt = getopt_long(argc, argv, ":L:CD:kndetc:ipvh", main_options, opt = getopt_long(argc, argv, ":L:CD:kndetrc:ipvh", main_options,
NULL); NULL);
if (opt < 0) if (opt < 0)
break; break;
@ -2682,6 +2687,9 @@ int main(int argc, char *argv[])
case 'c': case 'c':
hwsim_disable_ciphers(optarg); hwsim_disable_ciphers(optarg);
break; break;
case 'r':
no_register = true;
break;
case 'v': case 'v':
printf("%s\n", VERSION); printf("%s\n", VERSION);
return EXIT_SUCCESS; return EXIT_SUCCESS;