From c70200d1edc2639d87906138275d8abaad739416 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 29 May 2008 14:38:28 -0400
Subject: [PATCH] --- yaml --- r: 97679 b: refs/heads/master c:
 a6d4eae80157830af9c9d80de2daf6611696a34e h: refs/heads/master i:   97677:
 986599973e1f98bb4d92e2f5526af4ac94d16366   97675:
 f121d39ef764282dbe1d16e832f8c3bc4546f089   97671:
 f695020b186a8c60293e8fa88f1f054c1c6d27bf   97663:
 1c219ddfeefcf5ab3667da354a130aa84329808e v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/net/wireless/ipw2200.c | 27 +++++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 37a02757d0d7..172e555356e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b212f3378a9cfca4da52d7c7e6f79ead8ec287fc
+refs/heads/master: a6d4eae80157830af9c9d80de2daf6611696a34e
diff --git a/trunk/drivers/net/wireless/ipw2200.c b/trunk/drivers/net/wireless/ipw2200.c
index d74c061994ae..729336774828 100644
--- a/trunk/drivers/net/wireless/ipw2200.c
+++ b/trunk/drivers/net/wireless/ipw2200.c
@@ -7558,8 +7558,31 @@ static int ipw_associate(void *data)
 	    priv->ieee->iw_mode == IW_MODE_ADHOC &&
 	    priv->config & CFG_ADHOC_CREATE &&
 	    priv->config & CFG_STATIC_ESSID &&
-	    priv->config & CFG_STATIC_CHANNEL &&
-	    !list_empty(&priv->ieee->network_free_list)) {
+	    priv->config & CFG_STATIC_CHANNEL) {
+		/* Use oldest network if the free list is empty */
+		if (list_empty(&priv->ieee->network_free_list)) {
+			struct ieee80211_network *oldest = NULL;
+			struct ieee80211_network *target;
+			DECLARE_MAC_BUF(mac);
+
+			list_for_each_entry(target, &priv->ieee->network_list, list) {
+				if ((oldest == NULL) ||
+				    (target->last_scanned < oldest->last_scanned))
+					oldest = target;
+			}
+
+			/* If there are no more slots, expire the oldest */
+			list_del(&oldest->list);
+			target = oldest;
+			IPW_DEBUG_ASSOC("Expired '%s' (%s) from "
+					"network list.\n",
+					escape_essid(target->ssid,
+						     target->ssid_len),
+					print_mac(mac, target->bssid));
+			list_add_tail(&target->list,
+				      &priv->ieee->network_free_list);
+		}
+
 		element = priv->ieee->network_free_list.next;
 		network = list_entry(element, struct ieee80211_network, list);
 		ipw_adhoc_create(priv, network);