From ca42292f2b0ae7dff67905aff60459db81967bc8 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 17 Aug 2016 18:29:42 -0700 Subject: 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 --- core/hdd/src/wlan_hdd_cfg80211.c | 6 ++++-- 1 file 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]); -- cgit v1.2.3