From: Johannes Berg Date: Thu, 21 Jan 2010 15:26:26 +0000 (-0800) Subject: iwlwifi: remove superfluous channel check X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~21971^2~714^2~67 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d6bde7d9508f9ce9a5d57b1c0fa48f43fc5defa8;p=mirror_ubuntu-artful-kernel.git iwlwifi: remove superfluous channel check mac80211 will not allow using channels not marked as allowing IBSS for IBSS mode. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre --- 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) if (!ch_info) ch_info = &priv->channel_info[0]; - /* - * in some case A channels are all non IBSS - * in this case force B/G channel - */ - if ((priv->iw_mode == NL80211_IFTYPE_ADHOC) && - !(is_channel_ibss(ch_info))) - ch_info = &priv->channel_info[0]; - priv->staging_rxon.channel = cpu_to_le16(ch_info->channel); priv->band = ch_info->band;