Commit 37d06d71 authored by Kalle Valo's avatar Kalle Valo Committed by Jeff Johnson
Browse files

wifi: ath12k: ath12k_mac_set_key(): remove exit label 



In ath12k_mac_set_key() removing the exit label was a bit more complex so do
it in a separate patch. Remove the else branch and remove now the unnecessary
ret initialisation.

No functional changes.

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://patch.msgid.link/20241007165932.78081-6-kvalo@kernel.org


Signed-off-by: default avatarJeff Johnson <quic_jjohnson@quicinc.com>
parent 31489439

drivers/net/wireless/ath/ath12k/mac.c

+10 −12
Original line number Diff line number Diff line
@@ -3945,7 +3945,7 @@ static int ath12k_mac_set_key(struct ath12k *ar, enum set_key_cmd cmd, 
	struct ath12k_peer *peer;

	struct ath12k_sta *arsta;

	const u8 *peer_addr;

	int ret = 0;

	int ret;

	u32 flags = 0;



	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy);
@@ -3973,14 +3973,13 @@ static int ath12k_mac_set_key(struct ath12k *ar, enum set_key_cmd cmd, 
		if (cmd == SET_KEY) {

			ath12k_warn(ab, "cannot install key for non-existent peer %pM\n",

				    peer_addr);

			ret = -EOPNOTSUPP;

			goto exit;

		} else {

			return -EOPNOTSUPP;

		}



		/* if the peer doesn't exist there is no key to disable

		 * anymore

		 */

			goto exit;

		}

		return 0;

	}



	if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE)
@@ -3991,13 +3990,13 @@ static int ath12k_mac_set_key(struct ath12k *ar, enum set_key_cmd cmd, 
	ret = ath12k_install_key(arvif, key, cmd, peer_addr, flags);

	if (ret) {

		ath12k_warn(ab, "ath12k_install_key failed (%d)\n", ret);

		goto exit;

		return ret;

	}



	ret = ath12k_dp_rx_peer_pn_replay_config(arvif, peer_addr, cmd, key);

	if (ret) {

		ath12k_warn(ab, "failed to offload PN replay detection %d\n", ret);

		goto exit;

		return ret;

	}



	spin_lock_bh(&ab->base_lock);
@@ -4043,8 +4042,7 @@ static int ath12k_mac_set_key(struct ath12k *ar, enum set_key_cmd cmd, 


	spin_unlock_bh(&ab->base_lock);



exit:

	return ret;

	return 0;

}



static int ath12k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,