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

Commit f259509b authored by Bartosz Markowski's avatar Bartosz Markowski Committed by Kalle Valo
Browse files

ath10k: split the if_limits and if_comb 



Split the interface limits and inteface combination,
to reflect the 10.X capabilites (no P2P, no STA and 8 VAP).

kvalo: reverse order of ATH10K_FW_FEATURE_WMI_10X test, fix
checkpath warnings

Signed-off-by: default avatarBartosz Markowski <bartosz.markowski@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 453cdb61

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

+17 −9
Original line number Diff line number Diff line
@@ -3464,14 +3464,12 @@ static const struct ieee80211_iface_limit ath10k_if_limits[] = { 
	},

};



#ifdef CONFIG_ATH10K_DFS_CERTIFIED

static const struct ieee80211_iface_limit ath10k_if_dfs_limits[] = {

static const struct ieee80211_iface_limit ath10k_10x_if_limits[] = {

	{

	.max	= 8,

	.types	= BIT(NL80211_IFTYPE_AP)

	},

};

#endif



static const struct ieee80211_iface_combination ath10k_if_comb[] = {

	{
@@ -3481,19 +3479,22 @@ static const struct ieee80211_iface_combination ath10k_if_comb[] = { 
		.num_different_channels = 1,

		.beacon_int_infra_match = true,

	},

#ifdef CONFIG_ATH10K_DFS_CERTIFIED

};



static const struct ieee80211_iface_combination ath10k_10x_if_comb[] = {

	{

		.limits = ath10k_if_dfs_limits,

		.n_limits = ARRAY_SIZE(ath10k_if_dfs_limits),

		.limits = ath10k_10x_if_limits,

		.n_limits = ARRAY_SIZE(ath10k_10x_if_limits),

		.max_interfaces = 8,

		.num_different_channels = 1,

		.beacon_int_infra_match = true,

#ifdef CONFIG_ATH10K_DFS_CERTIFIED

		.radar_detect_widths =	BIT(NL80211_CHAN_WIDTH_20_NOHT) |

					BIT(NL80211_CHAN_WIDTH_20) |

					BIT(NL80211_CHAN_WIDTH_40) |

					BIT(NL80211_CHAN_WIDTH_80),

	}

#endif

	},

};



static struct ieee80211_sta_vht_cap ath10k_create_vht_cap(struct ath10k *ar)
@@ -3717,8 +3718,15 @@ int ath10k_mac_register(struct ath10k *ar) 
	 */

	ar->hw->queues = 4;



	if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {

		ar->hw->wiphy->iface_combinations = ath10k_10x_if_comb;

		ar->hw->wiphy->n_iface_combinations =

			ARRAY_SIZE(ath10k_10x_if_comb);

	} else {

		ar->hw->wiphy->iface_combinations = ath10k_if_comb;

	ar->hw->wiphy->n_iface_combinations = ARRAY_SIZE(ath10k_if_comb);

		ar->hw->wiphy->n_iface_combinations =

			ARRAY_SIZE(ath10k_if_comb);

	}



	ar->hw->netdev_features = NETIF_F_HW_CSUM;