mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-20 07:00:05 +01:00
2007-08-28 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerMain.h src/nm-device-802-11-wireless.c src/NetworkManager.c - Remove invalid AP list from NMData; need to rework this somewhat, but for now we should set the 'invalid' property on individual APs, and when we need to invalidate a whole ESS, set the 'invalid' on every member of that ESS git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2741 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
3443abf3f9
commit
0f1310cda0
4 changed files with 12 additions and 14 deletions
10
ChangeLog
10
ChangeLog
|
|
@ -1,3 +1,13 @@
|
|||
2007-08-28 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* src/NetworkManagerMain.h
|
||||
src/nm-device-802-11-wireless.c
|
||||
src/NetworkManager.c
|
||||
- Remove invalid AP list from NMData; need to rework this somewhat, but
|
||||
for now we should set the 'invalid' property on individual APs, and when
|
||||
we need to invalidate a whole ESS, set the 'invalid' on every member of
|
||||
that ESS
|
||||
|
||||
2007-08-28 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* src/NetworkManagerAP.c
|
||||
|
|
|
|||
|
|
@ -120,14 +120,6 @@ static NMData *nm_data_new (void)
|
|||
|
||||
data = g_slice_new0 (NMData);
|
||||
|
||||
/* Initialize the access point lists */
|
||||
data->invalid_ap_list = nm_ap_list_new (NETWORK_TYPE_INVALID);
|
||||
if (!data->invalid_ap_list) {
|
||||
nm_data_free (data);
|
||||
nm_warning ("could not create access point lists.");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
|
|
@ -142,8 +134,6 @@ static void nm_data_free (NMData *data)
|
|||
{
|
||||
g_return_if_fail (data != NULL);
|
||||
|
||||
nm_ap_list_unref (data->invalid_ap_list);
|
||||
|
||||
g_slice_free (NMData, data);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ typedef struct NMVPNManager NMVPNManager;
|
|||
|
||||
typedef struct NMData
|
||||
{
|
||||
struct NMAccessPointList *invalid_ap_list;
|
||||
} NMData;
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -831,7 +831,7 @@ nm_device_802_11_wireless_get_best_ap (NMDevice80211Wireless *self)
|
|||
|
||||
/* Only keep if its not in the invalid list and its _is_ in our scanned list */
|
||||
if ( keep
|
||||
&& !nm_ap_list_get_ap_by_ssid (app_data->invalid_ap_list, ssid)
|
||||
&& !nm_ap_get_invalid (cur_ap)
|
||||
&& nm_device_802_11_wireless_ap_list_get_ap_by_ssid (self, ssid))
|
||||
{
|
||||
return (NMAccessPoint *) g_object_ref (cur_ap);
|
||||
|
|
@ -846,7 +846,7 @@ nm_device_802_11_wireless_get_best_ap (NMDevice80211Wireless *self)
|
|||
const GByteArray * ap_ssid = nm_ap_get_ssid (scan_ap);
|
||||
|
||||
/* Access points in the "invalid" list cannot be used */
|
||||
if (nm_ap_list_get_ap_by_ssid (app_data->invalid_ap_list, ap_ssid))
|
||||
if (nm_ap_get_invalid (scan_ap))
|
||||
continue;
|
||||
|
||||
// FIXME: match up an NMConnection with some NMAccessPoint for the
|
||||
|
|
@ -2865,7 +2865,6 @@ activation_failure_handler (NMDevice *dev)
|
|||
{
|
||||
/* Add the AP to the invalid list */
|
||||
nm_ap_set_invalid (ap, TRUE);
|
||||
nm_ap_list_append_ap (app_data->invalid_ap_list, ap);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue