summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorTomasz Bursztyka <tomasz.bursztyka@linux.intel.com>2012-07-04 13:48:04 (GMT)
committerMarcel Holtmann <marcel@holtmann.org>2012-07-05 07:04:53 (GMT)
commitc1f3036eeabe20903d077f5e0069d644d93d5bfd (patch)
treea4df5af45c926e74eff06f6674121713cd8e549d /plugins
parentdcbd6fa4220183280b5b94683cfe7f3033009d37 (diff)
downloadconnman-c1f3036eeabe20903d077f5e0069d644d93d5bfd.zip
connman-c1f3036eeabe20903d077f5e0069d644d93d5bfd.tar.gz
connman-c1f3036eeabe20903d077f5e0069d644d93d5bfd.tar.bz2
gsupplicant: Adapt set country callback to return a result
This is necessary for the next coming patches, to fix country setting by interface
Diffstat (limited to 'plugins')
-rw-r--r--plugins/wifi.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/wifi.c b/plugins/wifi.c
index 06604d5..6be5c0c 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -1880,21 +1880,22 @@ static int tech_set_tethering(struct connman_technology *technology,
return -EOPNOTSUPP;
}
-static void regdom_callback(void *user_data)
+static void regdom_callback(int result, const char *alpha2, void *user_data)
{
- char *alpha2 = user_data;
-
DBG("");
if (wifi_technology == NULL)
return;
+ if (result != 0)
+ alpha2 = NULL;
+
connman_technology_regdom_notify(wifi_technology, alpha2);
}
static int tech_set_regdom(struct connman_technology *technology, const char *alpha2)
{
- return g_supplicant_set_country(alpha2, regdom_callback, alpha2);
+ return g_supplicant_set_country(alpha2, regdom_callback, NULL);
}
static struct connman_technology_driver tech_driver = {