From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 21 Jan 2010 15:32:20 +0000 (-0800)
Subject: iwlwifi: remove IBSS channel sanity check
X-Git-Tag: v2.6.35-rc1~473^2~714^2~62
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b2f30e8bdd8ef5f3b5a7ef9146509585a15347d3;p=~shefty%2Frdma-dev.git

iwlwifi: remove IBSS channel sanity check

mac80211 will always enforce using a channel
that the driver allowed for IBSS use.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
---

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 8e8f5282c01..4365e853f4b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -2436,15 +2436,6 @@ int iwl_mac_config(struct ieee80211_hw *hw, u32 changed)
 			goto set_ch_out;
 		}
 
-		if (priv->iw_mode == NL80211_IFTYPE_ADHOC &&
-			!is_channel_ibss(ch_info)) {
-			IWL_ERR(priv, "channel %d in band %d not "
-				"IBSS channel\n",
-				conf->channel->hw_value, conf->channel->band);
-			ret = -EINVAL;
-			goto set_ch_out;
-		}
-
 		spin_lock_irqsave(&priv->lock, flags);
 
 		/* Configure HT40 channels */