Commit 6bc9d6f7 authored by John Crispin's avatar John Crispin Committed by Kalle Valo
Browse files

ath11k: rename ath11k_wmi_base instances from wmi_sc to wmi_ab 



This makes the code consistent with the recent sc to ab rename.

Signed-off-by: default avatarJohn Crispin <john@phrozen.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent bde4d95e

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

+2 −2
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ static void ath11k_core_restart(struct work_struct *work) 
		idr_destroy(&ar->txmgmt_idr);

	}



	wake_up(&ab->wmi_sc.tx_credits_wq);

	wake_up(&ab->wmi_ab.tx_credits_wq);

	wake_up(&ab->peer_mapping_wq);



	ret = ath11k_core_reconfigure_on_crash(ab);
@@ -761,7 +761,7 @@ struct ath11k_base *ath11k_core_alloc(struct device *dev) 


	INIT_LIST_HEAD(&ab->peers);

	init_waitqueue_head(&ab->peer_mapping_wq);

	init_waitqueue_head(&ab->wmi_sc.tx_credits_wq);

	init_waitqueue_head(&ab->wmi_ab.tx_credits_wq);

	INIT_WORK(&ab->restart_work, ath11k_core_restart);

	timer_setup(&ab->rx_replenish_retry, ath11k_ce_rx_replenish_retry, 0);

	ab->dev = dev;

drivers/net/wireless/ath/ath11k/core.h

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ struct ath11k_base { 
	struct platform_device *pdev;

	struct device *dev;

	struct ath11k_qmi qmi;

	struct ath11k_wmi_base wmi_sc;

	struct ath11k_wmi_base wmi_ab;

	struct completion fw_ready;

	struct rproc *tgt_rproc;

	int num_radios;

drivers/net/wireless/ath/ath11k/htc.c

+1 −1
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ int ath11k_htc_init(struct ath11k_base *ab) 


	htc->ab = ab;



	switch (ab->wmi_sc.preferred_hw_mode) {

	switch (ab->wmi_ab.preferred_hw_mode) {

	case WMI_HOST_HW_MODE_SINGLE:

		htc->wmi_ep_count = 1;

		break;

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

+2 −2
Original line number Diff line number Diff line
@@ -5320,7 +5320,7 @@ ath11k_mac_update_bss_chan_survey(struct ath11k *ar, 


	lockdep_assert_held(&ar->conf_mutex);



	if (!test_bit(WMI_TLV_SERVICE_BSS_CHANNEL_INFO_64, ar->ab->wmi_sc.svc_map) ||

	if (!test_bit(WMI_TLV_SERVICE_BSS_CHANNEL_INFO_64, ar->ab->wmi_ab.svc_map) ||

	    ar->rx_channel != channel)

		return;
@@ -5838,7 +5838,7 @@ int ath11k_mac_allocate(struct ath11k_base *ab) 
		ar->pdev_idx = i;

		ar->lmac_id = ath11k_core_get_hw_mac_id(ab, i);



		ar->wmi = &ab->wmi_sc.wmi[i];

		ar->wmi = &ab->wmi_ab.wmi[i];

		/* FIXME wmi[0] is already initialized during attach,

		 * Should we do this again?

		 */

drivers/net/wireless/ath/ath11k/testmode.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static int ath11k_tm_cmd_wmi(struct ath11k *ar, struct nlattr *tb[]) 


	ath11k_dbg_dump(ar->ab, ATH11K_DBG_TESTMODE, NULL, "", buf, buf_len);



	skb = ath11k_wmi_alloc_skb(wmi->wmi_sc, buf_len);

	skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, buf_len);

	if (!skb) {

		ret = -ENOMEM;

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE