diff options
author | daniel oh <daniel.oh@broadcom.corp-partner.google.com> | 2021-05-26 16:08:59 +0900 |
---|---|---|
committer | daniel oh <daniel.oh@broadcom.corp-partner.google.com> | 2021-05-26 07:23:00 +0000 |
commit | 8bac6b20d6c8e0de2d0e46f2acf8632353d90bd5 (patch) | |
tree | 89c4bb4fbcf760cdde828acc3fd49f1ce3b43de9 | |
parent | 0bae19075c5a0edeb3b73da925f0ab77304c841c (diff) | |
download | bcm43752-android-gs-bluejay-5.10-android12L-d2.tar.gz |
bcmdhd : Remove kernel_read dependency from 43752 driverandroid-s-v2-beta-3_r0.6android-s-qpr3-beta-3_r0.5android-s-qpr3-beta-2_r0.5android-s-qpr3-beta-1_r0.6android-12.1.0_r0.6android-12.1.0_r0.40android-12.1.0_r0.35android-12.1.0_r0.28android-12.1.0_r0.22android-12.1.0_r0.16android-12.0.0_r0.9android-12.0.0_r0.8android-12.0.0_r0.42android-12.0.0_r0.36android-12.0.0_r0.26android-12.0.0_r0.17android-12.0.0_r0.16android-gs-raviole-mainlineandroid-gs-raviole-5.10-s-v2-beta-3android-gs-raviole-5.10-s-qpr3-beta-3android-gs-raviole-5.10-s-qpr3-beta-2android-gs-raviole-5.10-android12Landroid-gs-raviole-5.10-android12-qpr3android-gs-raviole-5.10-android12-qpr1-dandroid-gs-raviole-5.10-android12-d1android-gs-bluejay-5.10-android12L-d2
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 <daniel.oh@broadcom.corp-partner.google.com>
Change-Id: I92ccfde997c1aead7a68cf3eae988e2a58c34d63
-rwxr-xr-x | Kbuild | 4 | ||||
-rwxr-xr-x | linux_osl.c | 4 |
2 files changed, 5 insertions, 3 deletions
@@ -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)) */ |