Message ID | 20110615131009.GD23739@shale.localdomain (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
On Wed, Jun 15, 2011 at 04:10:10PM +0300, Dan Carpenter wrote: > Patch 7f1f9742514 "iwlegacy: refactor iwl4965_mac_channel_switch" > reversed a test and also it changed a spin_lock_irq() to > spin_lock(). I assume the spin_lock change was a mistake because > the unlock was left as spin_unlock_irq(). Thank you Dan! Stanislaw -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/iwlegacy/iwl4965-base.c b/drivers/net/wireless/iwlegacy/iwl4965-base.c index 49a80bb..46242d2 100644 --- a/drivers/net/wireless/iwlegacy/iwl4965-base.c +++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c @@ -2526,7 +2526,7 @@ void iwl4965_mac_channel_switch(struct ieee80211_hw *hw, if (!iwl_legacy_is_associated_ctx(ctx)) goto out; - if (priv->cfg->ops->lib->set_channel_switch) + if (!priv->cfg->ops->lib->set_channel_switch) goto out; ch = channel->hw_value; @@ -2539,7 +2539,7 @@ void iwl4965_mac_channel_switch(struct ieee80211_hw *hw, goto out; } - spin_lock(&priv->lock); + spin_lock_irq(&priv->lock); priv->current_ht_config.smps = conf->smps_mode;
Patch 7f1f9742514 "iwlegacy: refactor iwl4965_mac_channel_switch" reversed a test and also it changed a spin_lock_irq() to spin_lock(). I assume the spin_lock change was a mistake because the unlock was left as spin_unlock_irq(). Signed-off-by: Dan Carpenter <error27@gmail.com> --- Compile tested only. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html