[PATCH 1/2] ath10k: split the if_limits and if_comb

Kalle Valo kvalo at qca.qualcomm.com
Mon Dec 16 09:13:36 EST 2013


Bartosz Markowski <bartosz.markowski at tieto.com> writes:

> Split the interface limits and inteface combination,
> to reflect the 10.X capabilites (no P2P, no STA and 8 VAP).
>
> Signed-off-by: Bartosz Markowski <bartosz.markowski at tieto.com>

Both patches applied. I did minor changes in patch 1, please double
check:

> @@ -3717,8 +3718,15 @@ int ath10k_mac_register(struct ath10k *ar)
>  	 */
>  	ar->hw->queues = 4;
>  
> -	ar->hw->wiphy->iface_combinations = ath10k_if_comb;
> -	ar->hw->wiphy->n_iface_combinations = ARRAY_SIZE(ath10k_if_comb);
> +	if (!test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
> +
> +		ar->hw->wiphy->iface_combinations = ath10k_if_comb;
> +		ar->hw->wiphy->n_iface_combinations = ARRAY_SIZE(ath10k_if_comb);
> +
> +	} else {
> +		ar->hw->wiphy->iface_combinations = ath10k_10x_if_comb;
> +		ar->hw->wiphy->n_iface_combinations = ARRAY_SIZE(ath10k_10x_if_comb);
> +	}

I fixed checkpatch warnings here and reversed the test to get rid
unnecessary negation operator.

-- 
Kalle Valo



More information about the ath10k mailing list