From 0f1310cda0cb42b1ce1fbdfc97a6eb4d50a6eb45 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 28 Aug 2007 15:33:29 +0000 Subject: [PATCH] 2007-08-28 Dan Williams * 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 --- ChangeLog | 10 ++++++++++ src/NetworkManager.c | 10 ---------- src/NetworkManagerMain.h | 1 - src/nm-device-802-11-wireless.c | 5 ++--- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index abab48907..75d195d64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-08-28 Dan Williams + + * 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 * src/NetworkManagerAP.c diff --git a/src/NetworkManager.c b/src/NetworkManager.c index 590659dd2..9174bec77 100644 --- a/src/NetworkManager.c +++ b/src/NetworkManager.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); } diff --git a/src/NetworkManagerMain.h b/src/NetworkManagerMain.h index 73a547cff..d0a5110e6 100644 --- a/src/NetworkManagerMain.h +++ b/src/NetworkManagerMain.h @@ -34,7 +34,6 @@ typedef struct NMVPNManager NMVPNManager; typedef struct NMData { - struct NMAccessPointList *invalid_ap_list; } NMData; #endif diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c index 419644a91..4d2402856 100644 --- a/src/nm-device-802-11-wireless.c +++ b/src/nm-device-802-11-wireless.c @@ -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); } }