Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1680902b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ath10k: fix memory leak in rx ring buffer allocation"

parents ac821156 69a6025f

drivers/net/wireless/ath/ath10k/core.c

+6 −6
Original line number Diff line number Diff line
@@ -1886,6 +1886,12 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, 
		goto err_wmi_detach;

	}



	/* If firmware indicates Full Rx Reorder support it must be used in a

	 * slightly different manner. Let HTT code know.

	 */

	ar->htt.rx_ring.in_ord_rx = !!(test_bit(WMI_SERVICE_RX_FULL_REORDER,

						ar->wmi.svc_map));



	status = ath10k_htt_rx_alloc(&ar->htt);

	if (status) {

		ath10k_err(ar, "failed to alloc htt rx: %d\n", status);
@@ -1997,12 +2003,6 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, 
		}

	}



	/* If firmware indicates Full Rx Reorder support it must be used in a

	 * slightly different manner. Let HTT code know.

	 */

	ar->htt.rx_ring.in_ord_rx = !!(test_bit(WMI_SERVICE_RX_FULL_REORDER,

						ar->wmi.svc_map));



	status = ath10k_htt_rx_ring_refill(ar);

	if (status) {

		ath10k_err(ar, "failed to refill htt rx ring: %d\n", status);