| Message ID | 20200626225708.429239-1-matthewmwang@chromium.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/3] skip property update actions when wpa_config_set returns 1 | expand |
diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c index d1f9607c6..93eeb30e1 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.c +++ b/wpa_supplicant/dbus/dbus_new_handlers.c @@ -267,8 +267,15 @@ dbus_bool_t set_network_properties(struct wpa_supplicant *wpa_s, } else goto error; - if (wpa_config_set(ssid, entry.key, value, 0) < 0) + ret = wpa_config_set(ssid, entry.key, value, 0); + if (ret < 0) goto error; + if (ret == 1) { + os_free(value); + value = NULL; + wpa_dbus_dict_entry_clear(&entry); + continue; + } if (os_strcmp(entry.key, "bssid") != 0 && os_strcmp(entry.key, "priority") != 0)
When network properties are updated via dbus, wpa_config_set is used to update the property in the wpa_ssid struct. If it returns 1, the property was not changed and there's no need to perform any of the update actions. Signed-off-by: Matthew Wang <matthewmwang@chromium.org> --- wpa_supplicant/dbus/dbus_new_handlers.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)