colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifnet: remove wep_tx_keyidx only when necessary (bgo #670508)

Browse Source 
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.
This commit is contained in:
Mu Qiao
2012-02-21 21:59:10 +08:00
committed by Dan Williams
parent 28047305db
commit cd867534da
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/settings/plugins/ifnet/connection_parser.c
View File

@@ -2156,7 +2156,6 @@ write_wireless_security_setting (NMConnection * connection,
wpa_set_data (conn_name, "auth_alg", NULL); wpa_set_data (conn_name, "auth_alg", NULL);
/* Default WEP TX key index */ /* Default WEP TX key index */
wpa_set_data (conn_name, "wep_tx_keyidx", NULL);
if (wep) { if (wep) {
tmp = tmp =
g_strdup_printf ("%d", g_strdup_printf ("%d",
@@ -2164,7 +2163,8 @@ write_wireless_security_setting (NMConnection * connection,
(s_wsec)); (s_wsec));
wpa_set_data (conn_name, "wep_tx_keyidx", tmp); wpa_set_data (conn_name, "wep_tx_keyidx", tmp);
g_free (tmp); g_free (tmp);
} } else
wpa_set_data (conn_name, "wep_tx_keyidx", NULL);
/* WEP keys */ /* WEP keys */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {