summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrinivas Girigowda <sgirigow@codeaurora.org>2016-08-17 18:29:42 -0700
committerqcabuildsw <qcabuildsw@localhost>2016-10-12 01:25:12 -0700
commitca42292f2b0ae7dff67905aff60459db81967bc8 (patch)
tree1785b2efcaf4956cf82009c8f175181fb8a6bdc4
parent67e2da67cb054953463b7162e33d95afbc5fc1c9 (diff)
qcacld-3.0: Update get_concurrency_matrix to advertise STA + NAN
This is a qcacld-2.0 to qcacld-3.0 propagation. Update the get_concurrency_matrix API to advertise the support for STA + NAN concurrency. Change-Id: Ie178cdb8c01294ef103baebfd7805d80e4c3c3be CRs-Fixed: 987047
-rw-r--r--core/hdd/src/wlan_hdd_cfg80211.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index eb8fedd49527..8e18bcd66c0b 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -2068,11 +2068,13 @@ static int __wlan_hdd_cfg80211_get_concurrency_matrix(struct wiphy *wiphy,
/* Fill feature combination matrix */
feature_sets = 0;
feature_set_matrix[feature_sets++] = WIFI_FEATURE_INFRA |
- WIFI_FEATURE_P2P;
+ WIFI_FEATURE_P2P;
+ feature_set_matrix[feature_sets++] = WIFI_FEATURE_INFRA |
+ WIFI_FEATURE_NAN;
/* Add more feature combinations here */
feature_sets = QDF_MIN(feature_sets, max_feature_sets);
- hdd_info("Number of feature sets:%d", feature_sets);
+ hdd_info("Number of feature sets: %d", feature_sets);
hdd_info("Feature set matrix");
for (i = 0; i < feature_sets; i++)
hdd_info("[%d] 0x%02X", i, feature_set_matrix[i]);