From def467efb748d3460378072ea5c49dac865ec359 Mon Sep 17 00:00:00 2001
From: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Date: Wed, 19 Nov 2008 15:32:22 -0800
Subject: [PATCH] --- yaml --- r: 122320 b: refs/heads/master c:
 ce546fd2eacdbd8dc15f3d2ffd9a95661d082919 h: refs/heads/master v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index dd158ed927e3..150cdf5ad684 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e149cf5a1b1900484f4b808d59a5f246cd720be
+refs/heads/master: ce546fd2eacdbd8dc15f3d2ffd9a95661d082919
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 9330dfaff132..69fda64c6503 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -6321,10 +6321,7 @@ static void iwl3945_post_associate(struct iwl3945_priv *priv)
 
 	case NL80211_IFTYPE_ADHOC:
 
-		/* clear out the station table */
-		iwl3945_clear_stations_table(priv);
-
-		iwl3945_add_station(priv, iwl3945_broadcast_addr, 0, 0);
+		priv->assoc_id = 1;
 		iwl3945_add_station(priv, priv->bssid, 0, 0);
 		iwl3945_sync_sta(priv, IWL_STA_ID,
 				 (priv->band == IEEE80211_BAND_5GHZ) ?