stable inclusion
from stable-v5.10.94
commit bdc6c9fc5f78abbbf329139e4decb104ddd96e47
bugzilla: https://gitee.com/openeuler/kernel/issues/I531X9

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=bdc6c9fc5f78abbbf329139e4decb104ddd96e47

--------------------------------

[ Upstream commit 998e1aba ]

In some cases the sta is being removed twice since we do not test the
roc aux running before removing it. Start looking at the bit before
removing the sta.
Signed-off-by: NNathan Errera <nathan.errera@intel.com>
Fixes: 2c2c3647 ("iwlwifi: mvm: support ADD_STA_CMD_API_S ver 12")
Signed-off-by: NLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211219121514.d5376ac6bcb0.Ic5f8470ea60c072bde9d1503e5f528b65e301e20@changeidSigned-off-by: NLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>