aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-01-21 10:31:07 -0500
committerReinette Chatre <reinette.chatre@intel.com>2010-03-09 19:05:17 -0500
commitfbc66daa82b0f0aaae393323bcb9766a8b64e632 (patch)
tree2e278e8352d3ab85f483bdef985318c8018fa518 /drivers/net
parentb2f30e8bdd8ef5f3b5a7ef9146509585a15347d3 (diff)
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>
Diffstat (limited to 'drivers/net')
-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 4365e853f4b..5fa1da1f59c 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)
2252 return -EIO; 2252 return -EIO;
2253 } 2253 }
2254 2254
2255 if (priv->iw_mode != NL80211_IFTYPE_ADHOC) {
2256 IWL_DEBUG_MAC80211(priv, "leave - not IBSS\n");
2257 return -EIO;
2258 }
2259
2260 spin_lock_irqsave(&priv->lock, flags); 2255 spin_lock_irqsave(&priv->lock, flags);
2261 2256
2262 if (priv->ibss_beacon) 2257 if (priv->ibss_beacon)