[SRU] [A/B] [PATCH 1/1] iwlwifi: mvm: fix "failed to remove key" message

Kai-Heng Feng kai.heng.feng at canonical.com
Tue May 29 08:43:58 UTC 2018

From: Sara Sharon <sara.sharon at intel.com>

BugLink: https://bugs.launchpad.net/bugs/1720930

When the GTK is installed, we install it to HW with the
station ID of the AP.

Mac80211 will try to remove it only after the AP sta is
removed, which will result in a failure to remove key
since we do not have any station for it.

This is a valid situation, but a previous commit removed
the early return and added a return with error value, which
resulted in an error message that is confusing to users.

Remove the error return value.

Fixes: 85aeb58cec1a ("iwlwifi: mvm: Enable security on new TX API")
Signed-off-by: Sara Sharon <sara.sharon at intel.com>
Signed-off-by: Luca Coelho <luciano.coelho at intel.com>
(cherry picked from commit e4f13ad07823b24a1537518d2163bd164292fb10)
Signed-off-by: Kai-Heng Feng <kai.heng.feng at canonical.com>
 drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
index 027ee5e72172..f75b6f29675d 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
@@ -3312,8 +3312,9 @@ static int __iwl_mvm_remove_sta_key(struct iwl_mvm *mvm, u8 sta_id,
 	int ret, size;
 	u32 status;
+	/* This is a valid situation for GTK removal */
 	if (sta_id == IWL_MVM_INVALID_STA)
-		return -EINVAL;
+		return 0;
 	key_flags = cpu_to_le16((keyconf->keyidx << STA_KEY_FLG_KEYID_POS) &

More information about the kernel-team mailing list