From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 19 Dec 2009 03:41:29 +0000 (-0800)
Subject: Allow potential roaming between WPA and WPA2 networks
X-Git-Tag: 0.48~98
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c54809fdc3390d53c3a243c2d66b6cef8125d4c;p=platform%2Fupstream%2Fconnman.git

Allow potential roaming between WPA and WPA2 networks
---

diff --git a/plugins/supplicant.c b/plugins/supplicant.c
index a0daa59..c0b4d1c 100644
--- a/plugins/supplicant.c
+++ b/plugins/supplicant.c
@@ -1337,10 +1337,6 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
 
 	if (result.has_8021x == TRUE)
 		security = "ieee8021x";
-	else if (result.has_rsn == TRUE)
-		security = "rsn";
-	else if (result.has_wpa == TRUE)
-		security = "wpa";
 	else if (result.has_psk == TRUE)
 		security = "psk";
 	else if (result.has_wep == TRUE)
@@ -1354,6 +1350,13 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
 					result.ssid, result.ssid_len,
 							mode, security);
 
+	if (result.has_psk == TRUE) {
+		if (result.has_rsn == TRUE)
+			security = "rsn";
+		else if (result.has_wpa == TRUE)
+			security = "wpa";
+	}
+
 	network = connman_device_get_network(task->device, result.path);
 	if (network == NULL) {
 		int index;