diff options
| author | Amr BEN ABDESSALEM <amrx.ben.abdessalem@intel.com> | 2017-06-08 16:15:08 +0200 |
|---|---|---|
| committer | Bertolin, PierreX <pierrex.bertolin@intel.com> | 2017-09-07 06:50:36 -0700 |
| commit | 6f3fcae2f11693476cfd974f37c5e5f6798d5e18 (patch) | |
| tree | f33541d365db071f4b3fc5a7afdc32934f17d3ea | |
| parent | f9c71e0561b09473910bbba5b6bc73bc13cba53b (diff) | |
| download | x86-android-x86-spectralite-4.4-nougat-dr1-wear.tar.gz | |
wlan: disable p2p in DHD driverandroid-wear-7.1.1_r0.49android-x86-spectralite-4.4-nougat-dr1-wear
this patch is to disable p2p in DHD wifi driver
Change-Id: Ieba1c96e8db742d96af0e58c5754f6d94d75a068
Tracked-On: https://jira01.devtools.intel.com/browse/AW-5352
Signed-off-by: Amr BEN ABDESSALEM <amrx.ben.abdessalem@intel.com>
Reviewed-on: https://android.intel.com/586997
Reviewed-by: Wyper, AndrewX <andrewx.wyper@intel.com>
Reviewed-by: jenkins_ndg <jenkins_ndg@intel.com>
Reviewed-by: Dubray, SimonX <simonx.dubray@intel.com>
Reviewed-by: Korpershoek, MattijsX <mattijsx.korpershoek@intel.com>
Reviewed-by: Tasayco Loarte, VictorX <victorx.tasayco.loarte@intel.com>
| -rwxr-xr-x | drivers/net/wireless/bcmdhd/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/bcmdhd/wl_cfgp2p.c | 21 | ||||
| -rw-r--r-- | drivers/net/wireless/bcmdhd/wl_cfgp2p.h | 4 |
3 files changed, 2 insertions, 25 deletions
diff --git a/drivers/net/wireless/bcmdhd/Makefile b/drivers/net/wireless/bcmdhd/Makefile index 973a78abc7f5..e5c81bef60e6 100755 --- a/drivers/net/wireless/bcmdhd/Makefile +++ b/drivers/net/wireless/bcmdhd/Makefile @@ -5,7 +5,7 @@ DHDCFLAGS += -Wall -Wstrict-prototypes -Dlinux -DLINUX -DBCMDRIVER \ -DBCMDONGLEHOST -DUNRELEASEDCHIP -DBCMDMA32 -DBCMFILEIMAGE \ - -DDHDTHREAD -DSHOW_EVENTS -DBCMDBG -DWLP2P \ + -DDHDTHREAD -DSHOW_EVENTS -DBCMDBG \ -DWIFI_ACT_FRAME -DARP_OFFLOAD_SUPPORT \ -DKEEP_ALIVE -DCSCAN -DPKT_FILTER_SUPPORT \ -DEMBEDDED_PLATFORM -DPNO_SUPPORT \ diff --git a/drivers/net/wireless/bcmdhd/wl_cfgp2p.c b/drivers/net/wireless/bcmdhd/wl_cfgp2p.c index 8c5740c6f2c3..d1c2c0980f42 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfgp2p.c +++ b/drivers/net/wireless/bcmdhd/wl_cfgp2p.c @@ -1652,26 +1652,7 @@ wl_cfgp2p_bss(struct bcm_cfg80211 *cfg, struct net_device *ndev, s32 bsscfg_idx, s32 wl_cfgp2p_supported(struct bcm_cfg80211 *cfg, struct net_device *ndev) { - s32 ret = BCME_OK; - s32 p2p_supported = 0; - ret = wldev_iovar_getint(ndev, "p2p", - &p2p_supported); - if (ret < 0) { - if (ret == BCME_UNSUPPORTED) { - CFGP2P_INFO(("p2p is unsupported\n")); - return 0; - } else { - CFGP2P_ERR(("cfg p2p error %d\n", ret)); - return ret; - } - } - if (p2p_supported == 1) { - CFGP2P_INFO(("p2p is supported\n")); - } else { - CFGP2P_INFO(("p2p is unsupported\n")); - p2p_supported = 0; - } - return p2p_supported; + return 0; } /* Cleanup P2P resources */ s32 diff --git a/drivers/net/wireless/bcmdhd/wl_cfgp2p.h b/drivers/net/wireless/bcmdhd/wl_cfgp2p.h index 031a051ee54b..9a6bd8897cca 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfgp2p.h +++ b/drivers/net/wireless/bcmdhd/wl_cfgp2p.h @@ -207,10 +207,6 @@ enum wl_cfgp2p_status { or kernel version is 3.8.0 or above #endif /* WL_ENABLE_P2P_IF && (WL_CFG80211_P2P_DEV_IF || (LINUX_VERSION >= VERSION(3, 8, 0))) */ -#if !defined(WLP2P) && (defined(WL_ENABLE_P2P_IF) || defined(WL_CFG80211_P2P_DEV_IF)) -#error WLP2P not defined -#endif /* !WLP2P && (WL_ENABLE_P2P_IF || WL_CFG80211_P2P_DEV_IF) */ - #if defined(WL_CFG80211_P2P_DEV_IF) #define bcm_struct_cfgdev struct wireless_dev #else |