diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-01-21 18:26:26 +0300 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-03-10 03:04:04 +0300 |
| commit | d6bde7d9508f9ce9a5d57b1c0fa48f43fc5defa8 (patch) | |
| tree | f4f22ba769a5181b7af03510d834472437411a5c /drivers/net/wireless | |
| parent | e99f168c7cc2f78c07c23250fe933362847cb3e0 (diff) | |
| download | linux-d6bde7d9508f9ce9a5d57b1c0fa48f43fc5defa8.tar.xz | |
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>
Diffstat (limited to 'drivers/net/wireless')
| -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) 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; |