From 5da5a62a780cb7ac6a8d565f6e3b67aa5ab4c9a2 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 30 Apr 2010 11:30:50 -0700
Subject: [PATCH] --- yaml --- r: 195231 b: refs/heads/master c:
 63d4176933a5c4d9387eb79e1d50a9232e58c06e h: refs/heads/master i:   195229:
 eabe50f019b6ac26f086a5a7fe4b18ccf29a14fc   195227:
 104f3e68e4d907daf53e1c4f792abb315306e795   195223:
 d9df2b0acf6119f3b334ecef88cbf651b128b0af   195215:
 344abc562b28970c1a3c27baf53f5be1a693606c   195199:
 bf46c74b2e2aab2256f5d5ff4d6d2c07e9108bd5 v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-sta.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1c7ee57d892c..2e5f31cb6fac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57f8db89340f6ba5d913a1950b8dad4431d2beda
+refs/heads/master: 63d4176933a5c4d9387eb79e1d50a9232e58c06e
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-sta.c b/trunk/drivers/net/wireless/iwlwifi/iwl-sta.c
index c15098ed0416..85ed235ac901 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -284,10 +284,12 @@ static u8 iwl_prep_station(struct iwl_priv *priv, const u8 *addr,
 	station->sta.sta.sta_id = sta_id;
 	station->sta.station_flags = 0;
 
-	/* BCAST station and IBSS stations do not work in HT mode */
-	if (sta_id != priv->hw_params.bcast_sta_id &&
-	    priv->iw_mode != NL80211_IFTYPE_ADHOC)
-		iwl_set_ht_add_station(priv, sta_id, ht_info);
+	/*
+	 * OK to call unconditionally, since local stations (IBSS BSSID
+	 * STA and broadcast STA) pass in a NULL ht_info, and mac80211
+	 * doesn't allow HT IBSS.
+	 */
+	iwl_set_ht_add_station(priv, sta_id, ht_info);
 
 	/* 3945 only */
 	rate = (priv->band == IEEE80211_BAND_5GHZ) ?