From b58e72244ce5cee6e4855ce62e58ce827c7022d9 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 21 Jan 2010 07:31:07 -0800 Subject: [PATCH] --- yaml --- r: 193699 b: refs/heads/master c: fbc66daa82b0f0aaae393323bcb9766a8b64e632 h: refs/heads/master i: 193697: 25f1f28231de4bc75e0d3102d903a8edbba0e2d4 193695: f1588129ea94e32a2d00763abf7189ff5924996a v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index aea96643f9c8..1432aec205f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2f30e8bdd8ef5f3b5a7ef9146509585a15347d3 +refs/heads/master: fbc66daa82b0f0aaae393323bcb9766a8b64e632 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c b/trunk/drivers/net/wireless/iwlwifi/iwl-core.c index 4365e853f4b4..5fa1da1f59c9 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-core.c @@ -2252,11 +2252,6 @@ int iwl_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) return -EIO; } - if (priv->iw_mode != NL80211_IFTYPE_ADHOC) { - IWL_DEBUG_MAC80211(priv, "leave - not IBSS\n"); - return -EIO; - } - spin_lock_irqsave(&priv->lock, flags); if (priv->ibss_beacon)