From 44238c88aed451e16efd88f05f869f4c270fe776 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 29 Mar 2011 15:28:11 +0200 Subject: [PATCH] --- yaml --- r: 243703 b: refs/heads/master c: ffd8c746fbef50cf12df239f9d23c2afe1a2c3cb h: refs/heads/master i: 243701: dc2d1f5cb0f75c13fea4b249085ca56893f8625d 243699: b2df20a4166455ed9fa7aac97582a06051dc142f 243695: f368a0eedc4451c14fa7e7b34622e335dc7616ff v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlegacy/iwl-core.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 64aaf066a4e9..255ad10309ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24047e2c4feb8c126e92cc5bb7a863115c89bd72 +refs/heads/master: ffd8c746fbef50cf12df239f9d23c2afe1a2c3cb diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl-core.c b/trunk/drivers/net/wireless/iwlegacy/iwl-core.c index d418b647be80..a209a0e76bf0 100644 --- a/trunk/drivers/net/wireless/iwlegacy/iwl-core.c +++ b/trunk/drivers/net/wireless/iwlegacy/iwl-core.c @@ -1805,6 +1805,15 @@ iwl_legacy_mac_change_interface(struct ieee80211_hw *hw, mutex_lock(&priv->mutex); + if (!ctx->vif || !iwl_legacy_is_ready_rf(priv)) { + /* + * Huh? But wait ... this can maybe happen when + * we're in the middle of a firmware restart! + */ + err = -EBUSY; + goto out; + } + interface_modes = ctx->interface_modes | ctx->exclusive_interface_modes; if (!(interface_modes & BIT(newtype))) { @@ -1832,6 +1841,7 @@ iwl_legacy_mac_change_interface(struct ieee80211_hw *hw, /* success */ iwl_legacy_teardown_interface(priv, vif, true); vif->type = newtype; + vif->p2p = newp2p; err = iwl_legacy_setup_interface(priv, ctx); WARN_ON(err); /*