fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-24 21:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: call is_adhoc_wpa() only after we check '802-11-wireless' setting

Browse source 
This prevents assertion while checking a connection that is not a wireless one.
This commit is contained in:
Jiří Klimeš 2012-04-02 12:28:05 +02:00
parent 02482101ff
commit 47f9eb80d8
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/nm-device-wifi.c
View file

@ -1014,14 +1014,6 @@ real_check_connection_compatible (NMDevice *device,
const GByteArray *mac;
const GSList *mac_blacklist, *mac_blacklist_iter;
if (is_adhoc_wpa (connection)) {
g_set_error_literal (error,
NM_WIFI_ERROR,
NM_WIFI_ERROR_CONNECTION_INCOMPATIBLE,
"WPA Ad-Hoc disabled due to kernel bugs");
return FALSE;
}
s_con = nm_connection_get_setting_connection (connection);
g_assert (s_con);
@ -1040,6 +1032,7 @@ real_check_connection_compatible (NMDevice *device,
return FALSE;
}
mac = nm_setting_wireless_get_mac_address (s_wireless);
if (mac && memcmp (mac->data, &priv->perm_hw_addr, ETH_ALEN)) {
g_set_error (error,
@ -1067,6 +1060,14 @@ real_check_connection_compatible (NMDevice *device,
}
}
if (is_adhoc_wpa (connection)) {
g_set_error_literal (error,
NM_WIFI_ERROR,
NM_WIFI_ERROR_CONNECTION_INCOMPATIBLE,
"WPA Ad-Hoc disabled due to kernel bugs");
return FALSE;
}
// FIXME: check channel/freq/band against bands the hardware supports
// FIXME: check encryption against device capabilities
// FIXME: check bitrate against device capabilities