From 37a2548f53217612110968539305fe2feba27717 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 15 Jul 2010 05:59:07 -0700
Subject: [PATCH] --- yaml --- r: 203791 b: refs/heads/master c:
 6abbe554bab8ab908b3963577e14dc2e716fd485 h: refs/heads/master i:   203789:
 4ea51c263ced97ca081ca57bd6cd0b708daa7c85   203787:
 6b03ea3e9cd76caf49eeeeb33c3ae2fcd19fb0c0   203783:
 c35819eec307f69b68e6907c9d3d8dcdf765ce3a   203775:
 2250b5950b01a05dbf21cc78aa4d615fd1d85066 v: v3

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

diff --git a/[refs] b/[refs]
index ba87f59644ce..be3a4d2d98e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6fa17ed3fadaf056173c409c0877df428a152ec
+refs/heads/master: 6abbe554bab8ab908b3963577e14dc2e716fd485
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
index f8f8ea220ce1..9a78189c64f9 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -292,9 +292,7 @@ static u32 iwl_fill_beacon_frame(struct iwl_priv *priv,
 					  struct ieee80211_hdr *hdr,
 					  int left)
 {
-	if (!iwl_is_associated(priv) || !priv->ibss_beacon ||
-	    ((priv->iw_mode != NL80211_IFTYPE_ADHOC) &&
-	     (priv->iw_mode != NL80211_IFTYPE_AP)))
+	if (!priv->ibss_beacon)
 		return 0;
 
 	if (priv->ibss_beacon->len > left)
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 8eb347106902..9a7209d075c8 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -311,9 +311,7 @@ unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,
 				int left)
 {
 
-	if (!iwl_is_associated(priv) || !priv->ibss_beacon ||
-	    ((priv->iw_mode != NL80211_IFTYPE_ADHOC) &&
-	     (priv->iw_mode != NL80211_IFTYPE_AP)))
+	if (!iwl_is_associated(priv) || !priv->ibss_beacon)
 		return 0;
 
 	if (priv->ibss_beacon->len > left)