diff options
| author | Yun Park <yunp@qca.qualcomm.com> | 2014-01-11 00:18:55 -0800 |
|---|---|---|
| committer | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-02-11 19:54:41 -0800 |
| commit | 2e5288a35df382da58b559aecc48186fa09a15f3 (patch) | |
| tree | d5aaac403665b8d7bfd46ef19b7e73fe146be12a | |
| parent | 6ebee0b05e275644201a4aef46c7fb9fc808fa21 (diff) | |
qcacld: Selectively build p2p interface bring up per platform
To bring up P2P interface selectively per platform,
added a new build flag WLAN_OPEN_P2P_INTERFACE.
Change-Id: Ia2b77d672eee115c67f44bb8f7fa9e1ee4cb0864
CRs-fixed: 594777
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_main.c | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | Kbuild | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index 8a3ddd326b08..a95f46f63069 100644 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -8996,7 +8996,9 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) { VOS_STATUS status; hdd_adapter_t *pAdapter = NULL; +#ifdef WLAN_OPEN_P2P_INTERFACE hdd_adapter_t *pP2pAdapter = NULL; +#endif hdd_context_t *pHddCtx = NULL; v_CONTEXT_t pVosContext= NULL; #ifdef WLAN_BTAMP_FEATURE @@ -9498,6 +9500,9 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) { pAdapter = hdd_open_adapter( pHddCtx, WLAN_HDD_INFRA_STATION, "wlan%d", wlan_hdd_get_intf_addr(pHddCtx), FALSE ); + +#ifdef WLAN_OPEN_P2P_INTERFACE + /* Open P2P device interface */ if (pAdapter != NULL) { if ( pHddCtx->cfg_ini->isP2pDeviceAddrAdministrated ) @@ -9538,6 +9543,7 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) goto err_close_adapter; } } +#endif } if( pAdapter == NULL ) @@ -1103,6 +1103,11 @@ CDEFINES += -DQCA_CONFIG_SMP endif endif +#Open P2P device interface only for non-MDM9630 platform +ifneq ($(CONFIG_ARCH_MDM9630), y) +CDEFINES += -DWLAN_OPEN_P2P_INTERFACE +endif + # Fix build for GCC 4.7 EXTRA_CFLAGS += -Wno-maybe-uninitialized -Wno-unused-function |