diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-17 17:33:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-17 17:33:11 -0400 |
| commit | 9cbc94eabb0791906051bbfac024ef2c2be8e079 (patch) | |
| tree | 41ba194e687c6c60f5c883f98737ac83257d0c00 /drivers/net/wireless/iwlegacy | |
| parent | 1d1652cbdb9885e4d73972263e4cdbe1b0beebfe (diff) | |
| parent | 7cc31a9ae1477abc79d5992b3afe889f25c50c99 (diff) | |
| download | blackbird-op-linux-9cbc94eabb0791906051bbfac024ef2c2be8e079.tar.gz blackbird-op-linux-9cbc94eabb0791906051bbfac024ef2c2be8e079.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/vmxnet3/vmxnet3_ethtool.c
net/core/dev.c
Diffstat (limited to 'drivers/net/wireless/iwlegacy')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-core.c | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-dev.h | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-core.c b/drivers/net/wireless/iwlegacy/iwl-core.c index d743373a9424..42df8321dae8 100644 --- a/drivers/net/wireless/iwlegacy/iwl-core.c +++ b/drivers/net/wireless/iwlegacy/iwl-core.c @@ -2151,6 +2151,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) { diff --git a/drivers/net/wireless/iwlegacy/iwl-dev.h b/drivers/net/wireless/iwlegacy/iwl-dev.h index 2d87dba2cfa3..be0106c6a2da 100644 --- a/drivers/net/wireless/iwlegacy/iwl-dev.h +++ b/drivers/net/wireless/iwlegacy/iwl-dev.h @@ -1411,6 +1411,12 @@ iwl_legacy_is_channel_passive(const struct iwl_channel_info *ch) return (!(ch->flags & EEPROM_CHANNEL_ACTIVE)) ? 1 : 0; } +static inline int +iwl_legacy_is_channel_ibss(const struct iwl_channel_info *ch) +{ + return (ch->flags & EEPROM_CHANNEL_IBSS) ? 1 : 0; +} + static inline void __iwl_legacy_free_pages(struct iwl_priv *priv, struct page *page) { |
