---

yaml --- r: 193693 b: refs/heads/master c: d6bde7d h: refs/heads/master i: 193691: 3ee4027 v: v3
git-mirror · Mar 10, 2010 · a820283 · a820283
1 parent c4d054f
commit a820283
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e99f168c7cc2f78c07c23250fe933362847cb3e0
+refs/heads/master: d6bde7d9508f9ce9a5d57b1c0fa48f43fc5defa8
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c b/trunk/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;