From 64d40e0ce3c180ea6d64fc90aa5961cb5abcf12e Mon Sep 17 00:00:00 2001
From: Chenming Huang <chenhuan@codeaurora.org>
Date: Wed, 24 Jun 2020 18:16:47 +0800
Subject: [PATCH] Wifi(Automotive): Strip support of NAN+SAP
Strip support of NAN + SAP
CRs-Fixed: 2710957
Change-Id: I5c877a73d0b5794aee3d4ca45f432f93284cc9f5
---
msmnile_au/wlan.mk | 5 +++--
sdmshrike_au/wlan.mk | 5 +++--
sm6150_au/wlan.mk | 5 +++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/msmnile_au/wlan.mk b/msmnile_au/wlan.mk
index 32e84df..abe56bf 100644
--- a/msmnile_au/wlan.mk
+++ b/msmnile_au/wlan.mk
@@ -42,8 +42,9 @@ ifeq ($(TARGET_USES_AOSP_FOR_WLAN), true)
# Pure AOSP: Use pre-defined interface combinations with STA+SAP support
WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
else
-# Value-added AOSP: STA + SAP + P2P or NAN
-WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P, NAN}, 1}}
+# Value-added AOSP: STA + SAP + P2P or STA + P2P/NAN
+WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P}, 1}},\
+ {{{STA}, 1}, {{P2P, NAN}, 1}}
endif
# Override WLAN configurations
diff --git a/sdmshrike_au/wlan.mk b/sdmshrike_au/wlan.mk
index 6dcd3f0..34c646e 100644
--- a/sdmshrike_au/wlan.mk
+++ b/sdmshrike_au/wlan.mk
@@ -42,8 +42,9 @@ ifeq ($(TARGET_USES_AOSP_FOR_WLAN), true)
# Pure AOSP: Use pre-defined interface combinations with STA+SAP support
WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
else
-# Value-added AOSP: STA + SAP + P2P or NAN
-WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P, NAN}, 1}}
+# Value-added AOSP: STA + SAP + P2P or STA + P2P/NAN
+WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P}, 1}},\
+ {{{STA}, 1}, {{P2P, NAN}, 1}}
endif
# Override WLAN configurations
diff --git a/sm6150_au/wlan.mk b/sm6150_au/wlan.mk
index e2a8984..4757c1f 100644
--- a/sm6150_au/wlan.mk
+++ b/sm6150_au/wlan.mk
@@ -43,8 +43,9 @@ ifeq ($(TARGET_USES_AOSP_FOR_WLAN), true)
WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
WIFI_HIDL_FEATURE_AWARE := true
else
-# Value-added AOSP: STA + SAP + P2P or NAN
-WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P, NAN}, 1}}
+# Value-added AOSP: STA + SAP + P2P or STA + P2P/NAN
+WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P}, 1}},\
+ {{{STA}, 1}, {{P2P, NAN}, 1}}
endif
# Override WLAN configurations
--
GitLab