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

Commit dd3751f7 authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by Kalle Valo
Browse files

ath6kl: Cleanup fw interface type setting 



It is not necessary to use ath6kl_get_fw_iftype() to find out the
firmware interface type during initialization because the type
of the initial interface in INFRA_NETWORK. Hardcode the fw interface
type corresponding to INFRA_BSS instead of using ath6kl_get_fw_iftype().

Signed-off-by: default avatarVasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 8dafb70e

drivers/net/wireless/ath/ath6kl/init.c

+1 −18
Original line number Diff line number Diff line
@@ -91,21 +91,6 @@ void ath6kl_init_profile_info(struct ath6kl *ar) 
	ar->nw_type = ar->next_mode = INFRA_NETWORK;

}



static u8 ath6kl_get_fw_iftype(struct ath6kl *ar)

{

	switch (ar->nw_type) {

	case INFRA_NETWORK:

		return HI_OPTION_FW_MODE_BSS_STA;

	case ADHOC_NETWORK:

		return HI_OPTION_FW_MODE_IBSS;

	case AP_NETWORK:

		return HI_OPTION_FW_MODE_AP;

	default:

		ath6kl_err("Unsupported interface type :%d\n", ar->nw_type);

		return 0xff;

	}

}



static int ath6kl_set_host_app_area(struct ath6kl *ar)

{

	u32 address, data;
@@ -446,9 +431,7 @@ int ath6kl_configure_target(struct ath6kl *ar) 
	u32 param, ram_reserved_size;

	u8 fw_iftype;



	fw_iftype = ath6kl_get_fw_iftype(ar);

	if (fw_iftype == 0xff)

		return -EINVAL;

	fw_iftype = HI_OPTION_FW_MODE_BSS_STA;



	/* Tell target which HTC version it is used*/

	param = HTC_PROTOCOL_VERSION;