From 8bac6b20d6c8e0de2d0e46f2acf8632353d90bd5 Mon Sep 17 00:00:00 2001 From: daniel oh Date: Wed, 26 May 2021 16:08:59 +0900 Subject: bcmdhd : Remove kernel_read dependency from 43752 driver Removed VFS dependency. BAM is unrequired feature for bcm43752, so remove BAM feature. Also, place kernel_read under DHD_SUPPORT_VFS_CALL to avoid VFS dependency Bug: 189131064 Test: Verified compile and confirmed kernel_read is gone away from the mod file Signed-off-by: daniel oh Change-Id: I92ccfde997c1aead7a68cf3eae988e2a58c34d63 --- Kbuild | 4 +--- linux_osl.c | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Kbuild b/Kbuild index 02eeb01..6cbc8e7 100755 --- a/Kbuild +++ b/Kbuild @@ -395,8 +395,6 @@ DHDCFLAGS += -DWLAIBSS_PS DHDCFLAGS += -DSUPPORT_PM2_ONLY DHDCFLAGS += -DSUPPORT_AMPDU_MPDU_CMD DHDCFLAGS += -DWLADPS_PRIVATE_CMD -DHDCFLAGS += -DWL_BAM -DHDCFLAGS += -DWL_BAM_FILE_PATH="\"/vendor/etc/wifi/\"" DHDCFLAGS += -DWL_RELMCAST DHDCFLAGS += -DWL_SUPP_EVENT DHDCFLAGS += -DDISABLE_WL_FRAMEBURST_SOFTAP @@ -828,7 +826,7 @@ EXTRA_CFLAGS += $(BCMINTERNAL_DFLAGS) DHDOFILES += $(BCMINTERNAL_DHDOFILES) # customer4 extra Source files -DHDOFILES += wl_roam.o wl_bam.o +DHDOFILES += wl_roam.o #DHDOFILES += wl_roam.o dhd_pktlog.o bcm_app_utils.o wl_bigdata.o ifneq ($(filter -DDHD_PKT_LOGGING,$(DHDCFLAGS)),) diff --git a/linux_osl.c b/linux_osl.c index ebbd604..6925913 100755 --- a/linux_osl.c +++ b/linux_osl.c @@ -1206,7 +1206,11 @@ osl_timer_del(osl_t *osh, osl_timer_t *t) int kernel_read_compat(struct file *file, loff_t offset, char *addr, unsigned long count) { +#ifdef DHD_SUPPORT_VFS_CALL return (int)kernel_read(file, addr, (size_t)count, &offset); +#else + return 0; +#endif /* DHD_SUPPORT_VFS_CALL */ } #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)) */ -- cgit v1.2.3