Commit ac139aa3 authored by Benjamin Berg's avatar Benjamin Berg Committed by Johannes Berg
Browse files

wifi: iwlwifi: mvm: Return success if link could not be removed 



iwl_mvm_remove_link would return an error if the link could not be
removed. However, doing so prevents recovery if a link was not uploaded
to the FW in the first place and the link_info was not allocated or
fw_link_id is not set.

Returning success means that we can still try to continue with adding
new links in change_vif_links.

Signed-off-by: default avatarBenjamin Berg <benjamin.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20231017115047.f89bc05aadf6.Idc8fbd671362d962c02b1df87fa6258733631580@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e25bd185

drivers/net/wireless/intel/iwlwifi/mvm/link.c

+2 −1
Original line number Diff line number Diff line
@@ -242,9 +242,10 @@ int iwl_mvm_remove_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
	struct iwl_link_config_cmd cmd = {};

	int ret;



	/* mac80211 thought we have the link, but it was never configured */

	if (WARN_ON(!link_info ||

		    link_info->fw_link_id >= ARRAY_SIZE(mvm->link_id_to_link_conf)))

		return -EINVAL;

		return 0;



	RCU_INIT_POINTER(mvm->link_id_to_link_conf[link_info->fw_link_id],

			 NULL);