jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove forgotten driver_test.c variables

Browse source 
hostapd was still providing couple of parameters that were used only in
the already removed driver_test.c framework.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-11-29 12:49:55 +02:00
parent 73a2f82887
commit ebd557288c
6 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hostapd/config_file.c
View file

@ -2410,9 +2410,6 @@ static int hostapd_config_fill(struct hostapd_config *conf,
} else if (os_strcmp(buf, "radius_server_ipv6") == 0) { } else if (os_strcmp(buf, "radius_server_ipv6") == 0) {
bss->radius_server_ipv6 = atoi(pos); bss->radius_server_ipv6 = atoi(pos);
#endif /* RADIUS_SERVER */ #endif /* RADIUS_SERVER */
} else if (os_strcmp(buf, "test_socket") == 0) {
os_free(bss->test_socket);
bss->test_socket = os_strdup(pos);
} else if (os_strcmp(buf, "use_pae_group_addr") == 0) { } else if (os_strcmp(buf, "use_pae_group_addr") == 0) {
bss->use_pae_group_addr = atoi(pos); bss->use_pae_group_addr = atoi(pos);
} else if (os_strcmp(buf, "hw_mode") == 0) { } else if (os_strcmp(buf, "hw_mode") == 0) {

2
hostapd/hostapd.conf
View file

@ -18,7 +18,7 @@ interface=wlan0
# interface is also created. # interface is also created.
#bridge=br0 #bridge=br0
# Driver interface type (hostap/wired/test/none/nl80211/bsd); # Driver interface type (hostap/wired/none/nl80211/bsd);
# default: hostap). nl80211 is used with all Linux mac80211 drivers. # default: hostap). nl80211 is used with all Linux mac80211 drivers.
# Use driver=none if building hostapd as a standalone RADIUS server that does # Use driver=none if building hostapd as a standalone RADIUS server that does
# not control any wireless/wired driver. # not control any wireless/wired driver.

3
hostapd/main.c
View file

@ -184,9 +184,6 @@ static int hostapd_driver_init(struct hostapd_iface *iface)
} }
params.bssid = b; params.bssid = b;
params.ifname = hapd->conf->iface; params.ifname = hapd->conf->iface;
params.ssid = hapd->conf->ssid.ssid;
params.ssid_len = hapd->conf->ssid.ssid_len;
params.test_socket = hapd->conf->test_socket;
params.use_pae_group_addr = hapd->conf->use_pae_group_addr; params.use_pae_group_addr = hapd->conf->use_pae_group_addr;
params.num_bridge = hapd->iface->num_bss; params.num_bridge = hapd->iface->num_bss;

1
src/ap/ap_config.c
View file

@ -450,7 +450,6 @@ void hostapd_config_free_bss(struct hostapd_bss_config *conf)
os_free(conf->eap_fast_a_id_info); os_free(conf->eap_fast_a_id_info);
os_free(conf->eap_sim_db); os_free(conf->eap_sim_db);
os_free(conf->radius_server_clients); os_free(conf->radius_server_clients);
os_free(conf->test_socket);
os_free(conf->radius); os_free(conf->radius);
os_free(conf->radius_das_shared_secret); os_free(conf->radius_das_shared_secret);
hostapd_config_free_vlan(conf); hostapd_config_free_vlan(conf);

2
src/ap/ap_config.h
View file

@ -349,8 +349,6 @@ struct hostapd_bss_config {
int radius_server_acct_port; int radius_server_acct_port;
int radius_server_ipv6; int radius_server_ipv6;
char *test_socket; /* UNIX domain socket path for driver_test */
int use_pae_group_addr; /* Whether to send EAPOL frames to PAE group int use_pae_group_addr; /* Whether to send EAPOL frames to PAE group
* address instead of individual address * address instead of individual address
* (for driver_wired.c). * (for driver_wired.c).

3
src/drivers/driver.h
View file

@ -1247,9 +1247,6 @@ struct wpa_init_params {
void *global_priv; void *global_priv;
const u8 *bssid; const u8 *bssid;
const char *ifname; const char *ifname;
const u8 *ssid;
size_t ssid_len;
const char *test_socket;
int use_pae_group_addr; int use_pae_group_addr;
char **bridge; char **bridge;
size_t num_bridge; size_t num_bridge;