diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-11 19:13:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-11 19:13:08 -0400 |
| commit | 78d41b35a9570b7a9a45686789df5dfaeb2b7f4c (patch) | |
| tree | a28432584132a7c810b6b243795aec43544205ab /drivers/net/wireless/iwlegacy/iwl-core.c | |
| parent | 9bbc052d5e63512b0ce4e201ea97e12fba9fda82 (diff) | |
| parent | 2ae1b8b35faba31a59b153cbad07f9c15de99740 (diff) | |
| download | kernel_samsung_smdk4412-78d41b35a9570b7a9a45686789df5dfaeb2b7f4c.zip kernel_samsung_smdk4412-78d41b35a9570b7a9a45686789df5dfaeb2b7f4c.tar.gz kernel_samsung_smdk4412-78d41b35a9570b7a9a45686789df5dfaeb2b7f4c.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-core.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-core.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-core.c b/drivers/net/wireless/iwlegacy/iwl-core.c index c1511b1..42db0fc 100644 --- a/drivers/net/wireless/iwlegacy/iwl-core.c +++ b/drivers/net/wireless/iwlegacy/iwl-core.c @@ -2155,6 +2155,13 @@ int iwl_legacy_mac_config(struct ieee80211_hw *hw, u32 changed) 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) { |