[3.16.y-ckt stable] Patch "iwlwifi: mvm: fix failure path when power_update fails in add_interface" has been added to staging queue

Luis Henriques luis.henriques at canonical.com
Mon Mar 2 13:35:14 UTC 2015

This is a note to let you know that I have just added a patch titled

    iwlwifi: mvm: fix failure path when power_update fails in add_interface

to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree 
which can be found at:


This patch is scheduled to be released in version 3.16.7-ckt8.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.16.y-ckt tree, see



>From 42b2ca931874e366aa74f0b597d19cd52fa96ca3 Mon Sep 17 00:00:00 2001
From: Luciano Coelho <luciano.coelho at intel.com>
Date: Tue, 27 Jan 2015 15:06:57 +0200
Subject: iwlwifi: mvm: fix failure path when power_update fails in

commit fd66fc1cafd72ddf27dbec3a5e29e99839d1bc84 upstream.

When iwl_mvm_power_update_mac() is called, we have already added the
mac context, so if this call fails we should remove the mac.

Fixes: commit e5e7aa8e2561 ('iwlwifi: mvm: refactor power code')
Signed-off-by: Luciano Coelho <luciano.coelho at intel.com>
Reviewed-by: Johannes Berg <johannes.berg at intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
 drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 1a5351553078..b690f7a4ae2f 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -832,7 +832,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,

 	ret = iwl_mvm_power_update_mac(mvm);
 	if (ret)
-		goto out_release;
+		goto out_remove_mac;

 	/* beacon filtering */
 	ret = iwl_mvm_disable_beacon_filter(mvm, vif, 0);

More information about the kernel-team mailing list