Merge "ath10k: Add interface combinations for wcn3990" (8f794807) · Commits · e / devices / android_kernel_sony_msm8998

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

+83 −1

Original line number	Diff line number	Diff line
		@@ -7752,6 +7752,81 @@ static struct ieee80211_iface_combination ath10k_tlv_qcs_if_comb[] = {
		},
		};

		static const struct ieee80211_iface_limit ath10k_wcn3990_if_limit[] = {
		{
		.max = 2,
		.types = BIT(NL80211_IFTYPE_STATION),
		},
		{
		.max = 2,
		.types = BIT(NL80211_IFTYPE_AP) \|
		#ifdef CONFIG_MAC80211_MESH
		BIT(NL80211_IFTYPE_MESH_POINT) \|
		#endif
		BIT(NL80211_IFTYPE_P2P_CLIENT) \|
		BIT(NL80211_IFTYPE_P2P_GO),
		},
		{
		.max = 1,
		.types = BIT(NL80211_IFTYPE_P2P_DEVICE),
		},
		};

		static const struct ieee80211_iface_limit ath10k_wcn3990_qcs_if_limit[] = {
		{
		.max = 2,
		.types = BIT(NL80211_IFTYPE_STATION),
		},
		{
		.max = 2,
		.types = BIT(NL80211_IFTYPE_P2P_CLIENT),
		},
		{
		.max = 1,
		.types = BIT(NL80211_IFTYPE_AP) \|
		#ifdef CONFIG_MAC80211_MESH
		BIT(NL80211_IFTYPE_MESH_POINT) \|
		#endif
		BIT(NL80211_IFTYPE_P2P_GO),
		},
		{
		.max = 1,
		.types = BIT(NL80211_IFTYPE_P2P_DEVICE),
		},
		};

		static const struct ieee80211_iface_limit ath10k_wcn3990_if_limit_ibss[] = {
		{
		.max = 1,
		.types = BIT(NL80211_IFTYPE_STATION),
		},
		{
		.max = 1,
		.types = BIT(NL80211_IFTYPE_ADHOC),
		},
		};

		static struct ieee80211_iface_combination ath10k_wcn3990_qcs_if_comb[] = {
		{
		.limits = ath10k_wcn3990_if_limit,
		.num_different_channels = 1,
		.max_interfaces = 4,
		.n_limits = ARRAY_SIZE(ath10k_wcn3990_if_limit),
		},
		{
		.limits = ath10k_wcn3990_qcs_if_limit,
		.num_different_channels = 2,
		.max_interfaces = 4,
		.n_limits = ARRAY_SIZE(ath10k_wcn3990_qcs_if_limit),
		},
		{
		.limits = ath10k_wcn3990_if_limit_ibss,
		.num_different_channels = 1,
		.max_interfaces = 2,
		.n_limits = ARRAY_SIZE(ath10k_wcn3990_if_limit_ibss),
		},
		};

		static const struct ieee80211_iface_limit ath10k_10_4_if_limits[] = {
		{
		.max = 1,
		@@ -7983,6 +8058,14 @@ int ath10k_mac_register(struct ath10k *ar)
		ar->hw->wiphy->interface_modes \|= BIT(NL80211_IFTYPE_ADHOC);
		break;
		case ATH10K_FW_WMI_OP_VERSION_TLV:
		ar->hw->wiphy->interface_modes \|= BIT(NL80211_IFTYPE_ADHOC);
		if (QCA_REV_WCN3990(ar)) {
		ar->hw->wiphy->iface_combinations =
		ath10k_wcn3990_qcs_if_comb;
		ar->hw->wiphy->n_iface_combinations =
		ARRAY_SIZE(ath10k_wcn3990_qcs_if_comb);
		break;
		}
		if (test_bit(WMI_SERVICE_ADAPTIVE_OCS, ar->wmi.svc_map)) {
		ar->hw->wiphy->iface_combinations =
		ath10k_tlv_qcs_if_comb;
		@@ -7993,7 +8076,6 @@ int ath10k_mac_register(struct ath10k *ar)
		ar->hw->wiphy->n_iface_combinations =
		ARRAY_SIZE(ath10k_tlv_if_comb);
		}
		ar->hw->wiphy->interface_modes \|= BIT(NL80211_IFTYPE_ADHOC);
		break;
		case ATH10K_FW_WMI_OP_VERSION_10_1:
		case ATH10K_FW_WMI_OP_VERSION_10_2: