aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2008-12-09 20:15:47 (GMT)
committerJouni Malinen <j@w1.fi>2008-12-09 20:15:47 (GMT)
commit315ce40a007adcc0ff0d0425d39b14fba424d059 (patch)
treedd64f566b9a3d9809fbaf281ef040b18b364d94d /wpa_supplicant
parent814e925dc475e3cda98d60de39283f21bfac30f3 (diff)
downloadhostap-06-315ce40a007adcc0ff0d0425d39b14fba424d059.zip
hostap-06-315ce40a007adcc0ff0d0425d39b14fba424d059.tar.gz
hostap-06-315ce40a007adcc0ff0d0425d39b14fba424d059.tar.bz2
Renamed the 'alpha2' variable to 'country' to match with config string
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/config.h4
-rw-r--r--wpa_supplicant/config_file.c10
-rw-r--r--wpa_supplicant/wpa_supplicant.c4
3 files changed, 9 insertions, 9 deletions
diff --git a/wpa_supplicant/config.h b/wpa_supplicant/config.h
index 3ec2a01..0cea72f 100644
--- a/wpa_supplicant/config.h
+++ b/wpa_supplicant/config.h
@@ -254,12 +254,12 @@ struct wpa_config {
u8 uuid[16];
/**
- * alpha2 - Country code
+ * country - Country code
*
* This is the ISO/IEC alpha2 country code for which we are operating
* in
*/
- char alpha2[2];
+ char country[2];
};
diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c
index 09d6a67..c19cad4 100644
--- a/wpa_supplicant/config_file.c
+++ b/wpa_supplicant/config_file.c
@@ -276,10 +276,10 @@ static int wpa_config_process_country(struct wpa_config *config, char *pos)
wpa_printf(MSG_DEBUG, "Invalid country set");
return -1;
}
- config->alpha2[0] = pos[0];
- config->alpha2[1] = pos[1];
+ config->country[0] = pos[0];
+ config->country[1] = pos[1];
wpa_printf(MSG_DEBUG, "country='%c%c'",
- config->alpha2[0], config->alpha2[1]);
+ config->country[0], config->country[1]);
return 0;
}
@@ -891,9 +891,9 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config)
fprintf(f, "uuid=%s\n", buf);
}
#endif /* CONFIG_WPS */
- if (config->alpha2[0] && config->alpha2[1]) {
+ if (config->country[0] && config->country[1]) {
fprintf(f, "country=%c%c\n",
- config->alpha2[0], config->alpha2[1]);
+ config->country[0], config->country[1]);
}
}
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index c3e7dbd..cbe466c 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1790,8 +1790,8 @@ static int wpa_supplicant_init_iface2(struct wpa_supplicant *wpa_s)
if (wpa_supplicant_driver_init(wpa_s) < 0)
return -1;
- if (wpa_s->conf->alpha2[0] && wpa_s->conf->alpha2[1] &&
- wpa_drv_set_country(wpa_s, wpa_s->conf->alpha2)) {
+ if (wpa_s->conf->country[0] && wpa_s->conf->country[1] &&
+ wpa_drv_set_country(wpa_s, wpa_s->conf->country)) {
wpa_printf(MSG_DEBUG, "Failed to set country");
return -1;
}