summaryrefslogtreecommitdiff
path: root/gsupplicant
diff options
context:
space:
mode:
authorKalle Valo <kalle.valo@canonical.com>2010-09-28 00:44:14 +0300
committerSamuel Ortiz <sameo@linux.intel.com>2010-09-28 00:06:13 +0200
commit3e8e78f2f77c22763234a85157a472ecb63ca727 (patch)
tree6fdf642600dd3b913673c629480c8d2c6d5884bd /gsupplicant
parentf3e8c0ff1d26b1add5f9016f476c032647b583b8 (diff)
downloadconnman-3e8e78f2f77c22763234a85157a472ecb63ca727.tar.gz
connman-3e8e78f2f77c22763234a85157a472ecb63ca727.tar.bz2
connman-3e8e78f2f77c22763234a85157a472ecb63ca727.zip
gsupplicant: use term managed in object path
gsupplicant uses term "infra" instead of "managed" used by the old wifi plugin. This forced connman to create a new service instead of using the stored. For example, wifi_0026b6675606_76616c6f_managed_psk vs wifi_0026b6675606_76616c6f_infra_psk. Convert gsupplicant to use term "managed". That way old services work with the new plugin.
Diffstat (limited to 'gsupplicant')
-rw-r--r--gsupplicant/supplicant.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index 8b9f777b..f23ec474 100644
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -231,7 +231,7 @@ static const char *mode2string(GSupplicantMode mode)
case G_SUPPLICANT_MODE_UNKNOWN:
break;
case G_SUPPLICANT_MODE_INFRA:
- return "infra";
+ return "managed";
case G_SUPPLICANT_MODE_IBSS:
return "adhoc";
}
@@ -736,7 +736,7 @@ static void merge_network(GSupplicantNetwork *network)
g_string_append_printf(str, "%02x", ssid[i]);
if (g_strcmp0(mode, "0") == 0)
- g_string_append_printf(str, "_infra");
+ g_string_append_printf(str, "_managed");
else if (g_strcmp0(mode, "1") == 0)
g_string_append_printf(str, "_adhoc");