Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

diff --combined drivers/net/wireless/iwlegacy/iwl-core.c
index c1511b14b239c69884292e5e8e33296debbdebc4,dcbb2ef27f22480f054b1f0e659479278a90af5a..42db0fc8b921983d83bc244a8e4351ad207a0a0b
--- 1/drivers/net/wireless/iwlegacy/iwl-core.c
--- 2/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) {