summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-01-21 16:31:07 +0100
committerReinette Chatre <reinette.chatre@intel.com>2010-03-10 01:05:17 +0100
commitfbc66daa82b0f0aaae393323bcb9766a8b64e632 (patch)
tree2e278e8352d3ab85f483bdef985318c8018fa518
parentiwlwifi: remove IBSS channel sanity check (diff)
downloadlinux-fbc66daa82b0f0aaae393323bcb9766a8b64e632.tar.xz
linux-fbc66daa82b0f0aaae393323bcb9766a8b64e632.zip
iwlwifi: remove sanity check
iwl_mac_beacon_update can only be called when the operating mode is IBSS, so it doesn't need to verify that again. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 4365e853f4b4..5fa1da1f59c9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/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)