aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/main.c
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2009-04-09 10:40:12 (GMT)
committerJouni Malinen <j@w1.fi>2009-04-09 10:40:12 (GMT)
commitc51218372f6ee40c3830b4cb06fa58752e546d06 (patch)
tree42936f385bc11c7fe257cd8ab62e1561c84379b7 /wpa_supplicant/main.c
parentc2220ec0b7f47841fbec71d9f4626e2705a03a89 (diff)
downloadhostap-c51218372f6ee40c3830b4cb06fa58752e546d06.zip
hostap-c51218372f6ee40c3830b4cb06fa58752e546d06.tar.gz
hostap-c51218372f6ee40c3830b4cb06fa58752e546d06.tar.bz2
Merge wpa_supplicant and hostapd driver wrapper implementations
This commit merges the driver_ops structures and implementations from hostapd/driver*.[ch] into src/drivers. This is only an initial step and there is room for number of cleanups to share code between the hostapd and wpa_supplicant parts of the wrappers to avoid unnecessary source code duplication.
Diffstat (limited to 'wpa_supplicant/main.c')
-rw-r--r--wpa_supplicant/main.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c
index 2ae8ae4..7e77e3f 100644
--- a/wpa_supplicant/main.c
+++ b/wpa_supplicant/main.c
@@ -21,7 +21,7 @@
#include "wpa_supplicant_i.h"
#include "driver_i.h"
-extern struct wpa_driver_ops *wpa_supplicant_drivers[];
+extern struct wpa_driver_ops *wpa_drivers[];
static void usage(void)
@@ -41,10 +41,10 @@ static void usage(void)
"drivers:\n",
wpa_supplicant_version, wpa_supplicant_license);
- for (i = 0; wpa_supplicant_drivers[i]; i++) {
+ for (i = 0; wpa_drivers[i]; i++) {
printf(" %s = %s\n",
- wpa_supplicant_drivers[i]->name,
- wpa_supplicant_drivers[i]->desc);
+ wpa_drivers[i]->name,
+ wpa_drivers[i]->desc);
}
#ifndef CONFIG_NO_STDOUT_DEBUG
@@ -79,8 +79,7 @@ static void usage(void)
printf("example:\n"
" wpa_supplicant -D%s -iwlan0 -c/etc/wpa_supplicant.conf\n",
- wpa_supplicant_drivers[i] ?
- wpa_supplicant_drivers[i]->name : "wext");
+ wpa_drivers[i] ? wpa_drivers[i]->name : "wext");
#endif /* CONFIG_NO_STDOUT_DEBUG */
}