mesh: Remove duplicated no_auto_peer update

[mech_eap.git] / wpa_supplicant / ctrl_iface.c

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index ddc08bc..7a77a7f 100644 (file)
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -2930,8 +2930,6 @@ static int wpa_supplicant_ctrl_iface_update_network(
                wpa_config_update_psk(ssid);
        else if (os_strcmp(name, "priority") == 0)
                wpa_config_update_prio_list(wpa_s->conf);
-       else if (os_strcmp(name, "no_auto_peer") == 0)
-               ssid->no_auto_peer = atoi(value);
 
        return 0;
 }
@@ -2940,7 +2938,7 @@ static int wpa_supplicant_ctrl_iface_update_network(
 static int wpa_supplicant_ctrl_iface_set_network(
        struct wpa_supplicant *wpa_s, char *cmd)
 {
-       int id, ret, prev_bssid_set;
+       int id, ret, prev_bssid_set, prev_disabled;
        struct wpa_ssid *ssid;
        char *name, *value;
        u8 prev_bssid[ETH_ALEN];
@@ -2970,6 +2968,7 @@ static int wpa_supplicant_ctrl_iface_set_network(
        }
 
        prev_bssid_set = ssid->bssid_set;
+       prev_disabled = ssid->disabled;
        os_memcpy(prev_bssid, ssid->bssid, ETH_ALEN);
        ret = wpa_supplicant_ctrl_iface_update_network(wpa_s, ssid, name,
                                                       value);
@@ -2977,6 +2976,11 @@ static int wpa_supplicant_ctrl_iface_set_network(
            (ssid->bssid_set != prev_bssid_set ||
             os_memcmp(ssid->bssid, prev_bssid, ETH_ALEN) != 0))
                wpas_notify_network_bssid_set_changed(wpa_s, ssid);
+
+       if (prev_disabled != ssid->disabled &&
+           (prev_disabled == 2 || ssid->disabled == 2))
+               wpas_notify_network_type_changed(wpa_s, ssid);
+
        return ret;
 }
 
@@ -8651,6 +8655,7 @@ static char * wpas_global_ctrl_iface_redir_p2p(struct wpa_global *global,
                "P2P_SERV_DISC_EXTERNAL ",
                "P2P_SERVICE_ADD ",
                "P2P_SERVICE_DEL ",
+               "P2P_SERVICE_REP ",
                "P2P_REJECT ",
                "P2P_INVITE ",
                "P2P_PEER ",
@@ -8664,6 +8669,8 @@ static char * wpas_global_ctrl_iface_redir_p2p(struct wpa_global *global,
                "NFC_GET_HANDOVER_SEL ",
                "NFC_GET_HANDOVER_REQ ",
                "NFC_REPORT_HANDOVER ",
+               "P2P_ASP_PROVISION ",
+               "P2P_ASP_PROVISION_RESP ",
                NULL
        };
        int found = 0;