From cd867534da8295eeb0f25e3d8de07889a4d318db Mon Sep 17 00:00:00 2001 From: Mu Qiao Date: Tue, 21 Feb 2012 21:59:10 +0800 Subject: [PATCH] ifnet: remove wep_tx_keyidx only when necessary (bgo #670508) Always removing wep_tx_keyidx will cause wpa_supplicant.conf being written even if nothing has been changed. Now it will be removed only when wep is not used anymore. --- src/settings/plugins/ifnet/connection_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c index 3b51f6690b..3f8c18464d 100644 --- a/src/settings/plugins/ifnet/connection_parser.c +++ b/src/settings/plugins/ifnet/connection_parser.c @@ -2156,7 +2156,6 @@ write_wireless_security_setting (NMConnection * connection, wpa_set_data (conn_name, "auth_alg", NULL); /* Default WEP TX key index */ - wpa_set_data (conn_name, "wep_tx_keyidx", NULL); if (wep) { tmp = g_strdup_printf ("%d", @@ -2164,7 +2163,8 @@ write_wireless_security_setting (NMConnection * connection, (s_wsec)); wpa_set_data (conn_name, "wep_tx_keyidx", tmp); g_free (tmp); - } + } else + wpa_set_data (conn_name, "wep_tx_keyidx", NULL); /* WEP keys */ for (i = 0; i < 4; i++) {