diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-01-21 10:26:26 -0500 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-03-09 19:04:04 -0500 |
commit | d6bde7d9508f9ce9a5d57b1c0fa48f43fc5defa8 (patch) | |
tree | f4f22ba769a5181b7af03510d834472437411a5c | |
parent | e99f168c7cc2f78c07c23250fe933362847cb3e0 (diff) |
iwlwifi: remove superfluous channel check
mac80211 will not allow using channels not
marked as allowing IBSS for IBSS mode.
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.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index b994eee771a0..166087d6f72c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -1238,14 +1238,6 @@ void iwl_connection_init_rx_config(struct iwl_priv *priv, int mode) | |||
1238 | if (!ch_info) | 1238 | if (!ch_info) |
1239 | ch_info = &priv->channel_info[0]; | 1239 | ch_info = &priv->channel_info[0]; |
1240 | 1240 | ||
1241 | /* | ||
1242 | * in some case A channels are all non IBSS | ||
1243 | * in this case force B/G channel | ||
1244 | */ | ||
1245 | if ((priv->iw_mode == NL80211_IFTYPE_ADHOC) && | ||
1246 | !(is_channel_ibss(ch_info))) | ||
1247 | ch_info = &priv->channel_info[0]; | ||
1248 | |||
1249 | priv->staging_rxon.channel = cpu_to_le16(ch_info->channel); | 1241 | priv->staging_rxon.channel = cpu_to_le16(ch_info->channel); |
1250 | priv->band = ch_info->band; | 1242 | priv->band = ch_info->band; |
1251 | 1243 | ||