From: David S. Miller <davem@davemloft.net>
Date: Wed, 11 May 2011 23:13:08 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.39~28^2~8
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/78d41b35a9570b7a9a45686789df5dfaeb2b7f4c?hp=-c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
---

78d41b35a9570b7a9a45686789df5dfaeb2b7f4c
diff --combined drivers/net/wireless/iwlegacy/iwl-core.c
index c1511b14b239,dcbb2ef27f22..42db0fc8b921
--- a/drivers/net/wireless/iwlegacy/iwl-core.c
+++ b/drivers/net/wireless/iwlegacy/iwl-core.c
@@@ -1035,7 -1035,7 +1035,7 @@@ int iwl_legacy_apm_init(struct iwl_pri
  	/*
  	 * Enable HAP INTA (interrupt from management bus) to
  	 * wake device's PCI Express link L1a -> L0s
 -	 * NOTE:  This is no-op for 3945 (non-existant bit)
 +	 * NOTE:  This is no-op for 3945 (non-existent bit)
  	 */
  	iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,
  				    CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A);
@@@ -2155,6 -2155,13 +2155,13 @@@ int iwl_legacy_mac_config(struct ieee80
  			goto set_ch_out;
  		}
  
+ 		if (priv->iw_mode == NL80211_IFTYPE_ADHOC &&
+ 		    !iwl_legacy_is_channel_ibss(ch_info)) {
+ 			IWL_DEBUG_MAC80211(priv, "leave - not IBSS channel\n");
+ 			ret = -EINVAL;
+ 			goto set_ch_out;
+ 		}
+ 
  		spin_lock_irqsave(&priv->lock, flags);
  
  		for_each_context(priv, ctx) {