Revert "[Bugfix][API-1556] wifi driver support with/without hwnat in sdk"
This reverts commit cfe3e80446d417627be1f7a5bdc59a11920c0ad2.
Reason for revert: <INSERT REASONING HERE>
Change-Id: Ie047e340e1064c03ef1540e42e6ea2f7bc9a8cc1
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/images/mtk-image-2735.bb b/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/images/mtk-image-2735.bb
index 400d328..5161e54 100755
--- a/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/images/mtk-image-2735.bb
+++ b/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/images/mtk-image-2735.bb
@@ -10,9 +10,6 @@
STATE_DIR_IMAGE_SIZE ?= "14336"
VENDOR_PROP_FILE = "${IMAGE_ROOTFS}/vendor/build.prop"
-
-CONFIG_WIFI_WITH_HWNAT ?= "yes"
-
DEPENDS = "lynq-rootfs"
inherit core-image-tiny
#inherit create-link
@@ -165,23 +162,6 @@
mkdir -p ${IMAGE_ROOTFS}/${datadir}/wg870/
cp ${STAGING_DIR_HOST}/${datadir}/wg870/wifi_network ${IMAGE_ROOTFS}/${datadir}/wg870/
rm ${IMAGE_ROOTFS}/lib/systemd/system/sound.target.wants/alsa-restore.service
-
- rm -f ${IMAGE_ROOTFS}/lib/modules/4.19.98/kernel/drivers/net/wireless/bcmdhd/bcmdhd.ko
- if [ "${CONFIG_WIFI_WITH_HWNAT}" = "yes" ]; then
- if [ ! -f ${IMAGE_ROOTFS}/lib/modules/4.19.98/kernel/drivers/net/wireless/bcmdhd/bcmdhd_hwnat.ko ]; then
- echo "environment error, please clean and build again [1]!"
- exit 1
- fi
- rm -rf ${IMAGE_ROOTFS}/lib/modules/4.19.98/kernel/drivers/net/wireless/bcmdhd_no_hwnat
- ln -s ./bcmdhd_hwnat.ko ${IMAGE_ROOTFS}/lib/modules/4.19.98/kernel/drivers/net/wireless/bcmdhd/bcmdhd.ko
- else
- if [ ! -f ${IMAGE_ROOTFS}/lib/modules/4.19.98/kernel/drivers/net/wireless/bcmdhd_no_hwnat/bcmdhd_no_hwnat.ko ]; then
- echo "environment error, please clean and build again [2]!"
- exit 1
- fi
- rm -f ${IMAGE_ROOTFS}/lib/modules/4.19.98/kernel/drivers/net/wireless/bcmdhd/bcmdhd_hwnat.ko
- ln -s ../bcmdhd_no_hwnat/bcmdhd_no_hwnat.ko ${IMAGE_ROOTFS}/lib/modules/4.19.98/kernel/drivers/net/wireless/bcmdhd/bcmdhd.ko
- fi
}
ROOTFS_POSTPROCESS_COMMAND += "mk_oem_init_part_rootfs_post;"
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/files/init_mount_nand b/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/files/init_mount_nand
index adeb10e..39fb01e 100755
--- a/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/files/init_mount_nand
+++ b/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/files/init_mount_nand
@@ -187,10 +187,7 @@
#you.chen@2022-07-11 add for load oemapp begin
init_oemapp() {
#jb.qi add for enable hwnat on 20231205
- ls -al /lib/modules/4.19.98/kernel/drivers/net/wireless/bcmdhd/bcmdhd.ko | grep "bcmdhd_hwnat"
- if [ $? -eq 0 ]; then
- ifconfig eth0 up
- fi
+ ifconfig eth0 up
mnt_folder oemdata /oemdata
diff --git a/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb b/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb
index 41fa050..44c12f5 100755
--- a/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb
+++ b/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb
@@ -220,10 +220,6 @@
mkdir ${IMAGE_ROOTFS}/sdcard
echo "${NATA_SERIAL_NUMBER}" >> ${IMAGE_ROOTFS}/sdcard/nata_serial.txt
-
- rm -f ${IMAGE_ROOTFS}/lib/modules/4.19.98/kernel/drivers/net/wireless/bcmdhd/bcmdhd.ko
- ln -s ./bcmdhd_hwnat.ko ${IMAGE_ROOTFS}/lib/modules/4.19.98/kernel/drivers/net/wireless/bcmdhd/bcmdhd.ko
-
}
ROOTFS_POSTPROCESS_COMMAND += " gen_feature_property;"
diff --git a/meta/meta-mediatek-mt2735/recipes-core/initial/files/init_mount_nand b/meta/meta-mediatek-mt2735/recipes-core/initial/files/init_mount_nand
index adeb10e..39fb01e 100755
--- a/meta/meta-mediatek-mt2735/recipes-core/initial/files/init_mount_nand
+++ b/meta/meta-mediatek-mt2735/recipes-core/initial/files/init_mount_nand
@@ -187,10 +187,7 @@
#you.chen@2022-07-11 add for load oemapp begin
init_oemapp() {
#jb.qi add for enable hwnat on 20231205
- ls -al /lib/modules/4.19.98/kernel/drivers/net/wireless/bcmdhd/bcmdhd.ko | grep "bcmdhd_hwnat"
- if [ $? -eq 0 ]; then
- ifconfig eth0 up
- fi
+ ifconfig eth0 up
mnt_folder oemdata /oemdata
diff --git a/src/kernel/linux/v4.19/drivers/net/wireless/Makefile b/src/kernel/linux/v4.19/drivers/net/wireless/Makefile
index f9a6a4d..0269dc2 100644
--- a/src/kernel/linux/v4.19/drivers/net/wireless/Makefile
+++ b/src/kernel/linux/v4.19/drivers/net/wireless/Makefile
@@ -5,7 +5,6 @@
#tianyan@2021.7.27 modify for add wifi6 module start
obj-$(CONFIG_CYW89570) += bcmdhd/
-obj-$(CONFIG_CYW89570) += bcmdhd_no_hwnat/
#tianyan@2021.7.27 modify for add wifi6 module end
#tianyan@2021.8.18 modify for add wifi5 module start
obj-$(CONFIG_BCM4359) += bcmdhd_wifi5/
diff --git a/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd/Makefile b/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd/Makefile
index bee8e57..1b08a5c 100755
--- a/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd/Makefile
+++ b/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd/Makefile
@@ -597,8 +597,8 @@
EXTRA_CFLAGS += -I$(src)/include/ -I$(src)/
KBUILD_CFLAGS += -I$(KDIR)/include -I$(CURDIR)
-bcmdhd_hwnat-objs := $(DHDOFILES)
-obj-$(DRIVER_TYPE) += bcmdhd_hwnat.o
+bcmdhd-objs := $(DHDOFILES)
+obj-$(DRIVER_TYPE) += bcmdhd.o
all:
@echo "$(MAKE) --no-print-directory -C $(KDIR) M=$(CURDIR) modules"
diff --git a/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd_no_hwnat/Makefile b/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd_no_hwnat/Makefile
deleted file mode 100755
index c10922e..0000000
--- a/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd_no_hwnat/Makefile
+++ /dev/null
@@ -1,617 +0,0 @@
-# bcmdhd
-#
-# Portions of this code are copyright (c) 2023 Cypress Semiconductor Corporation
-#
-# Copyright (C) 1999-2016, Broadcom Corporation
-#
-# Unless you and Broadcom execute a separate written software license
-# agreement governing use of this software, this software is licensed to you
-# under the terms of the GNU General Public License version 2 (the "GPL"),
-# available at http://www.broadcom.com/licenses/GPLv2.php, with the
-# following added to such license:
-#
-# As a special exception, the copyright holders of this software give you
-# permission to link this software with independent modules, and to copy and
-# distribute the resulting executable under terms of your choice, provided that
-# you also meet, for each linked independent module, the terms and conditions of
-# the license of that module. An independent module is a module which is not
-# derived from this software. The special exception does not apply to any
-# modifications of the software.
-#
-# Notwithstanding the above, under no circumstances may you combine this
-# software in any way with any other Broadcom software provided under a license
-# other than the GPL, without Broadcom's express prior written consent.
-#
-#
-# <<Broadcom-WL-IPTag/Open:>>
-#
-
-#####################
-# SDIO Basic feature
-#####################
-
-DHDCFLAGS += -Wall -Wstrict-prototypes -Dlinux -DLINUX -DBCMDRIVER \
- -DBCMDONGLEHOST -DUNRELEASEDCHIP -DBCMDMA32 -DBCMFILEIMAGE \
- -DDHDTHREAD -DSHOW_EVENTS -DBCMDBG -DWLP2P \
- -DWIFI_ACT_FRAME -DARP_OFFLOAD_SUPPORT \
- -DKEEP_ALIVE -DCSCAN -DPKT_FILTER_SUPPORT \
- -DEMBEDDED_PLATFORM -DPNO_SUPPORT -DSHOW_LOGTRACE \
- -DGET_CUSTOM_MAC_ENABLE \
- -DSEC_ENHANCEMENT -DDHD_FW_COREDUMP -DCHIPS_CUSTOMER_HW6 \
- -DDHD_RND_DEBUG -DDHD_DUMP_FILE_WRITE_FROM_KERNEL \
- -DDHD_DONOT_FORWARD_BCMEVENT_AS_NETWORK_PKT -DWL11AX
-
-GCCVERSIONGTEQ9 := $(shell expr `$(CROSS_COMPILE)gcc -dumpversion | cut -f1 -d.` \>= 9)
-ifeq "$(GCCVERSIONGTEQ9)" "1"
- DHDCFLAGS += -Wno-error=date-time
-endif
-GCCVERSIONGTEQ7 := $(shell expr `$(CROSS_COMPILE)gcc -dumpversion | cut -f1 -d.` \>= 7)
-ifeq "$(GCCVERSIONGTEQ7)" "1"
- DHDCFLAGS += -Wimplicit-fallthrough=3
-endif
-DHDCFLAGS += $(call cc-disable-warning, date-time)
-DHDCFLAGS += $(call cc-disable-warning, stringop-overflow)
-# ifx apply patch to disable twt 20231116
-DHDCFLAGS += -DCUSTOM_CONTROL_TWT_DISABLE
-# ifx apply patch to disable twt 20231116 end
-
-#################
-# Common feature
-#################
-DHDCFLAGS += -DAUTOMOTIVE_FEATURE
-DHDCFLAGS += -DWL_VIRTUAL_APSTA
-# Dongle init fail
-DHDCFLAGS += -DDEBUG_DNGL_INIT_FAIL
-DHDCFLAGS += -DPOWERUP_MAX_RETRY=0
-DHDCFLAGS += -DWL_SUPPORT_AUTO_CHANNEL
-
-# Wapi
-DHDCFLAGS += -DBCMWAPI_WPI -DBCMWAPI_WAI
-
-# Allow wl event forwarding as network packet
-DHDCFLAGS += -DWL_EVENT_ENAB
-
-DHDCFLAGS += -DWL_CFG80211
-# Print out kernel panic point of file and line info when assertion happened
-DHDCFLAGS += -DBCMASSERT_LOG
-
-# Enable Log Dump
-DHDCFLAGS += -DDHD_LOG_DUMP
-DHDCFLAGS += -DOEM_ANDROID
-
-# Enable Register access via dhd IOVAR
-DHDCFLAGS += -DDHD_PCIE_REG_ACCESS -DDHD_BUS_MEM_ACCESS
-
-# CUSTOMER4 flags
-DHDCFLAGS += -DDHD_PKTID_AUDIT_ENABLED
-DHDCFLAGS += -DSUPPORT_HIDDEN_AP
-DHDCFLAGS += -DPASS_ALL_MCAST_PKTS -DESCAN_BUF_OVERFLOW_MGMT -DPKTPRIO_OVERRIDE
-DHDCFLAGS += -DUSE_INITIAL_SHORT_DWELL_TIME
-DHDCFLAGS += -DSOFTAP_UAPSD_OFF
-DHDCFLAGS += -DSUPPORT_LTECX -DSUPPORT_2G_VHT
-DHDCFLAGS += -DSUPPORT_WL_TXPOWER -DBLOCK_IPV6_PACKET -DSUPPORT_DEEP_SLEEP
-DHDCFLAGS += -DSUPPORT_AMPDU_MPDU_CMD -DSOFTAP_SEND_HANGEVT -DNUM_SCB_MAX_PROBE=3
-DHDCFLAGS += -DCUSTOM_TCPACK_DELAY_TIME=10
-DHDCFLAGS += -DDEBUGFS_CFG80211
-DHDCFLAGS += -DSUPPORT_SOFTAP_WPAWPA2_MIXED
-DHDCFLAGS += -DSUPPORT_2G_VHT -DSUPPORT_5G_1024QAM_VHT
-DHDCFLAGS += -DEWP_ECNTRS_LOGGING
-DHDCFLAGS += -DEWP_ETD_PRSRV_LOGS
-DHDCFLAGS += -DCFI_CHECK
-
-# Runtime PM feature
-# DHDCFLAGS += -DDHD_PCIE_RUNTIMEPM -DMAX_IDLE_COUNT=11 -DCUSTOM_DHD_RUNTIME_MS=100
-
-# DMA64 suppports on 64bit Architecture
-ifeq ($(CONFIG_ARM64),y)
- DHDCFLAGS := $(filter-out -DBCMDMA32,$(DHDCFLAGS))
- DHDCFLAGS += -DBCMDMA64OSL
-endif
-
-# DMA64 suppports on x64bit Architecture
-#ifeq ($(CONFIG_64BIT),y)
-# DHDCFLAGS := $(filter-out -DBCMDMA32,$(DHDCFLAGS))
-# DHDCFLAGS += -DBCMDMA64OSL
-#endif // endif
-
-## OOB
-ifeq ($(CONFIG_BCMDHD_OOB_HOST_WAKE),y)
- DHDCFLAGS += -DBCMPCIE_OOB_HOST_WAKE
-endif
-
-# keepalive
-DHDCFLAGS += -DCUSTOM_KEEP_ALIVE_SETTING=28000
-
-#OCE enable/disable in dhd
-DHDCFLAGS += -DOCE_SUPPORT
-
-#OWE enable in dhd
-DHDCFLAGS += -DWL_OWE
-
-DHDCFLAGS += -DVSDB
-
-# For p2p connection issue
-DHDCFLAGS += -DWL_SCB_TIMEOUT=10
-
-# TDLS enable
-DHDCFLAGS += -DWLTDLS -DWLTDLS_AUTO_ENABLE
-# For TDLS tear down inactive time 40 sec
-DHDCFLAGS += -DCUSTOM_TDLS_IDLE_MODE_SETTING=10000
-# for TDLS RSSI HIGH for establishing TDLS link
-DHDCFLAGS += -DCUSTOM_TDLS_RSSI_THRESHOLD_HIGH=-80
-# for TDLS RSSI HIGH for tearing down TDLS link
-DHDCFLAGS += -DCUSTOM_TDLS_RSSI_THRESHOLD_LOW=-85
-
-# Roaming
-DHDCFLAGS += -DROAM_AP_ENV_DETECTION
-DHDCFLAGS += -DROAM_ENABLE -DROAM_CHANNEL_CACHE -DROAM_API
-DHDCFLAGS += -DENABLE_FW_ROAM_SUSPEND
-# Roaming trigger
-DHDCFLAGS += -DCUSTOM_ROAM_TRIGGER_SETTING=-75
-DHDCFLAGS += -DCUSTOM_ROAM_DELTA_SETTING=10
-# Set PM 2 always regardless suspend/resume
-DHDCFLAGS += -DSUPPORT_PM2_ONLY
-
-DHDCFLAGS += -DDISABLE_FW_ROAM
-# FT roam
-DHDCFLAGS += -DWLFBT -DGTK_OFFLOAD_SUPPORT
-DHDCFLAGS += -DBCMCCX
-DHDCFLAGS += -DWBTEXT
-DHDCFLAGS += -DDHD_LOSSLESS_ROAMING
-
-# Hog flags
-ifeq ($(CONFIG_ENABLE_HOGSQS), y)
-DHDCFLAGS += -DENABLE_HOGSQS
-DHDCFLAGS += -DM_HOGSQS_CFG=0x1910
-endif
-
-# For special PNO Event keep wake lock for 10sec
-DHDCFLAGS += -DCUSTOM_PNO_EVENT_LOCK_xTIME=10
-DHDCFLAGS += -DMIRACAST_AMPDU_SIZE=8
-#Vendor Extension
-#DHDCFLAGS += -DWL_VENDOR_EXT_SUPPORT
-#Gscan
-DHDCFLAGS += -DGSCAN_SUPPORT
-#PNO Scan Result Version
-DHDCFLAGS += -DPFN_SCANRESULT_2
-#RSSI Monitor
-DHDCFLAGS += -DRSSI_MONITOR_SUPPORT
-#APF
-DHDCFLAGS += -DAPF
-#NDOffload
-DHDCFLAGS += -DNDO_CONFIG_SUPPORT
-DHDCFLAGS += -DIPV6_NDO_SUPPORT
-
-#Link Statistics
-DHDCFLAGS += -DLINKSTAT_SUPPORT
-
-#Debugaility
-DHDCFLAGS += -DDBG_PKT_MON -DDBG_PKT_MON_INIT_DEFAULT
-DHDCFLAGS += -DWL_SCHED_SCAN
-DHDCFLAGS += -DDNGL_EVENT_SUPPORT
-
-#RSSI Monitor
-DHDCFLAGS += -DRSSI_MONITOR_SUPPORT
-
-# Early suspend
-DHDCFLAGS += -DDHD_USE_EARLYSUSPEND
-
-# For Scan result patch
-DHDCFLAGS += -DESCAN_RESULT_PATCH
-
-# NAN
-#DHDCFLAGS += -DWL_NAN -DWL_NAN_DISC_CACHE
-
-# For Static Buffer
-ifeq ($(CONFIG_DHD_USE_STATIC_BUF),y)
- DHDCFLAGS += -DENHANCED_STATIC_BUF
- DHDCFLAGS += -DSTATIC_WL_PRIV_STRUCT
-endif
-ifneq ($(CONFIG_DHD_USE_SCHED_SCAN),)
-DHDCFLAGS += -DWL_SCHED_SCAN
-endif
-
-# Prevent rx thread monopolize
-DHDCFLAGS += -DWAIT_DEQUEUE
-
-# idle count
-DHDCFLAGS += -DDHD_USE_IDLECOUNT
-
-# SKB TAILPAD to avoid out of boundary memory access
-DHDCFLAGS += -DDHDENABLE_TAILPAD
-
-# Wi-Fi Direct
-DHDCFLAGS += -DWL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST
-DHDCFLAGS += -DWL_CFG80211_STA_EVENT
-DHDCFLAGS += -DWL_IFACE_COMB_NUM_CHANNELS
-DHDCFLAGS += -DWL_SUPPORT_MULTIP2P
-#SCAN time
-DHDCFLAGS += -DCUSTOM_SET_SHORT_DWELL_TIME
-DHDCFLAGS += -DCUSTOM_FORCE_NODFS_FLAG
-ifeq ($(CONFIG_ANDROID),y)
- DHDCFLAGS += -DKEEP_WIFION_OPTION
- DHDCFLAGS += -Wno-date-time
-
-#Android features
-ifeq ($(shell expr $(CONFIG_ANDROID_VERSION) \>= 12), 1)
- DHDCFLAGS += -DCONFIG_ANDROID_VERSION=$(CONFIG_ANDROID_VERSION)
- DHDCFLAGS += -DP2P_RAND
- DHDCFLAGS += -DSOFTAP_RAND
-#To support Android12 CDD [C-1-7] [C-1-8] [C-1-9] [C-1-10]
- DHDCFLAGS += -DSUPPORT_RANDOM_MAC_SCAN
-
-#To support recovery
- DHDCFLAGS += -DWL_CFGVENDOR_SEND_HANG_EVENT
-
- DHDCFLAGS += -DWL_SELF_MANAGED_REGDOM
-
-# To support ACS on hostapd
-# DHDCFLAGS += -DWL_SUPPORT_ACS_OFFLOAD
-endif
-endif
-
-# SoftAP
-DHDCFLAGS += -DSET_RANDOM_MAC_SOFTAP
-DHDCFLAGS += -DWL_CFG80211_ACL
-ifeq ($(CONFIG_WL_AP_IF),y)
- DHDCFLAGS += -DWL_STATIC_IF
- DHDCFLAGS += -DDHD_NUM_STATIC_IFACES=2
-endif
-
-# QT support
-ifeq ($(CONFIG_QT), y)
- DHDCFLAGS += -DBCMQT_HW -DBCMSLTGT -DBCMQT
-endif
-
-# Disable FRAMEBURST on VSDB
-DHDCFLAGS += -DDISABLE_FRAMEBURST_VSDB
-
-# WPS
-DHDCFLAGS += -DWL_WPS_SYNC -DBCMCRYPTO_COMPONENT
-
-#WPA3
-ifneq ($(CONFIG_BCMDHD_WPA3),)
- DHDCFLAGS += -DWL_SAE
-endif
-
-ifneq ($(CONFIG_BCMDHD_PCIE),)
-DHDCFLAGS += -DDHD_4WAYM4_FAIL_DISCONNECT
-endif
-
-#802.11ax and 6Ghz Support
-ifeq ($(CONFIG_BCMDHD_WIFI6_6E),y)
-# DHDCFLAGS += -DWL11AX
- DHDCFLAGS += -DWL_6E
-endif
-
-#IFX cfg80211 support
-ifeq ($(CONFIG_BCMDHD_IFX_CFG80211),y)
- #For 5.4.21 kernel
- DHDCFLAGS += -DIFX_CFG80211_5_4_21
-endif
-
-# Uncomment the below line for AP to receive disconnect management frame.
-# DHDCFLAGS += -DWL_CFG80211_AP_RX_MGMT_DISCONNECT
-
-# Bandsteer support
-# DHDCFLAGS += -DDHD_BANDSTEER
-
-##########################
-# driver type
-# m: module type driver
-# y: built-in type driver
-##########################
-DRIVER_TYPE ?= $(CONFIG_BCMDHD)
-
-#############################
-# Bring up WARs for CYW89570.
-# # To be removed later
-# #############################
-ifneq ($(CONFIG_WIRELESS_EXT),)
- DHDOFILES += wl_iw.o bcm_app_utils.o
- DHDCFLAGS += -DWL_WIRELESS_EXT -DWLLXIW -DUSE_IW
-endif
-
-ifeq ($(CONFIG_TRXHDR_V3),y)
- DHDCFLAGS += -DBCMTRXV3
-else
- DHDCFLAGS += -DBCMTRXV4
-endif
-
-#########################
-# Chip dependent feature
-#########################
-
- DHDCFLAGS += -DUSE_WL_TXBF
- DHDCFLAGS += -DCUSTOM_DPC_CPUCORE=0
-
-# New Features
- DHDCFLAGS += -DWL11U
- DHDCFLAGS += -DMFP
-# Disabling LPC for 89570 for now.
-# DHDCFLAGS += -DDHD_ENABLE_LPC
- DHDCFLAGS += -DCUSTOM_COUNTRY_CODE
- DHDCFLAGS += -DNDO_CONFIG_SUPPORT
- DHDCFLAGS += -DIPV6_NDO_SUPPORT
- DHDCFLAGS += -DIGUANA_LEGACY_CHIPS
-
-ifeq ($(CONFIG_BCMDHD_SDMMC),y)
- DHDCFLAGS += -DBCMLXSDMMC -DCUSTOM_TXGLOM=1
-ifneq ($(CONFIG_HAVE_IMX8_SOC),)
- DHDCFLAGS += \
- -DCONFIG_DTS \
- -DOEM_EMBEDDED_LINUX \
- -DPLATFORM_IMX \
- -DSDIO_ISR_THREAD \
- -DWL_VIF_SUPPORT
-endif
-endif
-
-ifeq ($(CONFIG_BCMDHD_SDIOH_STD),y)
- DHDCFLAGS += -DBCMSDIOH_STD
-endif
-
-ifeq ($(CONFIG_BCMDHD_SDIO),y)
- DHDCFLAGS += -DBDC -DHW_OOB -DDHD_BCMEVENTS -DMMC_SDIO_ABORT
- DHDCFLAGS += -DBCMSDIO -DUSE_SDIOFIFO_IOVAR
- DHDCFLAGS += -DPROP_TXSTATUS -DLIMIT_BORROW
- DHDCFLAGS += -DPROP_TXSTATUS_VSDB
- DHDCFLAGS += -DUSE_WL_FRAMEBURST
-# tput enhancement
- DHDCFLAGS += -DCUSTOM_GLOM_SETTING=8 -DCUSTOM_RXCHAIN=1
- DHDCFLAGS += -DUSE_DYNAMIC_F2_BLKSIZE -DDYNAMIC_F2_BLKSIZE_FOR_NONLEGACY=128
- DHDCFLAGS += -DBCMSDIOH_TXGLOM -DAMPDU_HOSTREORDER
- DHDCFLAGS += -DDHDTCPACK_SUPPRESS
- DHDCFLAGS += -DRXFRAME_THREAD
- DHDCFLAGS += -DREPEAT_READFRAME
- DHDCFLAGS += -DCUSTOM_MAX_TXGLOM_SIZE=40
- DHDCFLAGS += -DMAX_HDR_READ=128
- DHDCFLAGS += -DDHD_FIRSTREAD=64
-ifneq ($(CONFIG_BCM4373),)
- DHDCFLAGS += -DCUSTOM_AMPDU_BA_WSIZE=32
-else
- DHDCFLAGS += -DCUSTOM_AMPDU_BA_WSIZE=64
-
-endif
-
-# bcn_timeout
- DHDCFLAGS += -DCUSTOM_BCN_TIMEOUT_SETTING=5
-
- DHDCFLAGS += -DWLFC_STATE_PREALLOC
- DHDCFLAGS += -DREVERSE_AIFSN
-
-# btsharedsdio
-ifneq ($(CONFIG_BT_OVER_SDIO),)
- DHDCFLAGS += -DBT_OVER_SDIO
-endif
-endif
-
-# Expand TCP tx queue to 10 times of default size
- DHDCFLAGS += -DTSQ_MULTIPLIER=10
-
-ifneq ($(CONFIG_BCMDHD_PCIE),)
- DHDCFLAGS += -DPCIE_FULL_DONGLE -DBCMPCIE -DCUSTOM_DPC_PRIO_SETTING=-1
-# tput enhancement
- DHDCFLAGS += -DCUSTOM_AMPDU_BA_WSIZE=64
- DHDCFLAGS += -DPROP_TXSTATUS_VSDB
-# Disable watchdog thread
- DHDCFLAGS += -DCUSTOM_DHD_WATCHDOG_MS=0
-# HEAP ASLR
- DHDCFLAGS += -DBCM_ASLR_HEAP
- DHDCFLAGS += -DMAX_CNTL_TX_TIMEOUT=1
-ifneq ($(CONFIG_ARCH_MSM),)
- DHDCFLAGS += -DMSM_PCIE_LINKDOWN_RECOVERY
-endif
-ifeq ($(CONFIG_DHD_USE_STATIC_BUF),y)
- DHDCFLAGS += -DDHD_USE_STATIC_IOCTLBUF
-endif
-ifeq ($(CONFIG_BCMDHD_COHERENT_MEM_RING),y)
-DHDCFLAGS += -DDHD_USE_COHERENT_MEM_FOR_RING
-endif
-# Enable health check event handling
- DHDCFLAGS += -DDNGL_EVENT_SUPPORT
- DHDCFLAGS += -DHCHK_COMMON_SW_EVENT
-ifneq ($(CONFIG_DHD_OF_SUPPORT),)
- DHDCFLAGS += -DDHD_OF_SUPPORT
- DHDOFILES += dhd_custom_msm.o
-ifneq ($(CONFIG_BROADCOM_WIFI_RESERVED_MEM),)
- DHDOFILES += dhd_custom_memprealloc.o
-endif
-endif
-
-# Enable Load Balancing support by default.
-# DHD_LB_RXP - Perform RX Packet processing in parallel
-# DHD_LB_STATS - To display the Load Blancing statistics
-DHDCFLAGS += -DDHD_LB -DDHD_LB_RXP -DDHD_LB_STATS
-DHDCFLAGS += -DDHD_LB_PRIMARY_CPUS=0xF0 -DDHD_LB_SECONDARY_CPUS=0x0E
-
-# Runtime PM feature
-# DHDCFLAGS += -DDHD_PCIE_RUNTIMEPM -DMAX_IDLE_COUNT=11 -DCUSTOM_DHD_RUNTIME_MS=100
-
-# debug info
- DHDCFLAGS += -DDHD_WAKE_STATUS -DDHD_WAKE_RX_STATUS
-
-# Enable SSSR Dump
- DHDCFLAGS += -DDHD_SSSR_DUMP
-endif
-
-# Print 802.1X packets
- DHDCFLAGS += -DDHD_8021X_DUMP
-# prioritize 802.1x packet
- DHDCFLAGS += -DEAPOL_PKT_PRIO
-
-# Enable MSI interrupt Support
- DHDCFLAGS += -DDHD_MSI_SUPPORT
- DHDCFLAGS += -DDHD_FORCE_MSI
- DHDCFLAGS += -DDHD_DISABLE_FWLOG_IN_CHIPBOOT
-# Enabling temporarily due to build failure
- DHDCFLAGS += -DDHD_PKTTS -DTX_STATUS_LATENCY_STATS
-
-ifneq ($(filter y, $(CONFIG_BCM4354) $(CONFIG_BCM4356)),)
- DHDCFLAGS += -DUSE_WL_TXBF
- DHDCFLAGS += -DUSE_WL_FRAMEBURST
- DHDCFLAGS += -DCUSTOM_DPC_CPUCORE=0
- DHDCFLAGS += -DPROP_TXSTATUS_VSDB
- DHDCFLAGS += -DCUSTOM_PSPRETEND_THR=30
- DHDCFLAGS += -DMAX_AP_CLIENT_CNT=10
- DHDCFLAGS += -DMAX_GO_CLIENT_CNT=5
-# New Features
- DHDCFLAGS += -DWL11U
- DHDCFLAGS += -DMFP
- DHDCFLAGS += -DDHD_ENABLE_LPC
- DHDCFLAGS += -DCUSTOM_COUNTRY_CODE
- DHDCFLAGS += -DSAR_SUPPORT
-# debug info
- DHDCFLAGS += -DDHD_WAKE_STATUS
-ifeq ($(CONFIG_BCMDHD_SDIO),y)
- DHDCFLAGS += -DBDC -DOOB_INTR_ONLY -DHW_OOB -DDHD_BCMEVENTS -DMMC_SDIO_ABORT
- DHDCFLAGS += -DBCMSDIO -DBCMLXSDMMC -DUSE_SDIOFIFO_IOVAR
- DHDCFLAGS += -DPROP_TXSTATUS
- DHDCFLAGS += -DCUSTOM_AMPDU_MPDU=16
- DHDCFLAGS += -DCUSTOM_AMPDU_BA_WSIZE=64
-# tput enhancement
- DHDCFLAGS += -DCUSTOM_GLOM_SETTING=8 -DCUSTOM_RXCHAIN=1
- DHDCFLAGS += -DUSE_DYNAMIC_F2_BLKSIZE -DDYNAMIC_F2_BLKSIZE_FOR_NONLEGACY=128
- DHDCFLAGS += -DBCMSDIOH_TXGLOM -DCUSTOM_TXGLOM=1 -DBCMSDIOH_TXGLOM_HIGHSPEED
- DHDCFLAGS += -DDHDTCPACK_SUPPRESS
- DHDCFLAGS += -DRXFRAME_THREAD
- DHDCFLAGS += -DREPEAT_READFRAME
- DHDCFLAGS += -DCUSTOM_MAX_TXGLOM_SIZE=40
- DHDCFLAGS += -DMAX_HDR_READ=128
- DHDCFLAGS += -DDHD_FIRSTREAD=128
-# bcn_timeout
- DHDCFLAGS += -DCUSTOM_BCN_TIMEOUT=5
- DHDCFLAGS += -DWLFC_STATE_PREALLOC
-endif
-
-ifneq ($(CONFIG_BCMDHD_PCIE),)
- DHDCFLAGS += -DPCIE_FULL_DONGLE -DBCMPCIE -DCUSTOM_DPC_PRIO_SETTING=-1
-# tput enhancement
- DHDCFLAGS += -DCUSTOM_AMPDU_BA_WSIZE=64
- DHDCFLAGS += -DPROP_TXSTATUS_VSDB
-# Disable watchdog thread
- DHDCFLAGS += -DCUSTOM_DHD_WATCHDOG_MS=0
- DHDCFLAGS += -DMAX_CNTL_TX_TIMEOUT=1
- DHDCFLAGS += -DSUPPORT_LINKDOWN_RECOVERY
-# Enable health check event handling
- DHDCFLAGS += -DDNGL_EVENT_SUPPORT
- DHDCFLAGS += -DHCHK_COMMON_SW_EVENT
-endif
-ifeq ($(CONFIG_DHD_USE_STATIC_BUF),y)
- DHDCFLAGS += -DDHD_USE_STATIC_IOCTLBUF
-endif
-# Print 802.1X packets
- DHDCFLAGS += -DDHD_8021X_DUMP
-# Print DHCP packets
- DHDCFLAGS += -DDHD_DHCP_DUMP
-endif
-
-ifneq ($(CONFIG_BCM4339),)
- DHDCFLAGS += -DBCM4339_CHIP -DHW_OOB
-
- # tput enhancement
- DHDCFLAGS += -DCUSTOM_GLOM_SETTING=8 -DCUSTOM_RXCHAIN=1
- DHDCFLAGS += -DUSE_DYNAMIC_F2_BLKSIZE -DDYNAMIC_F2_BLKSIZE_FOR_NONLEGACY=128
- DHDCFLAGS += -DBCMSDIOH_TXGLOM -DCUSTOM_TXGLOM=1 -DBCMSDIOH_TXGLOM_HIGHSPEED
- DHDCFLAGS += -DDHDTCPACK_SUPPRESS
- DHDCFLAGS += -DUSE_WL_TXBF
- DHDCFLAGS += -DUSE_WL_FRAMEBURST
- DHDCFLAGS += -DRXFRAME_THREAD
- DHDCFLAGS += -DCUSTOM_AMPDU_BA_WSIZE=64
- DHDCFLAGS += -DCUSTOM_DPC_CPUCORE=0
- DHDCFLAGS += -DPROP_TXSTATUS_VSDB
- DHDCFLAGS += -DCUSTOM_MAX_TXGLOM_SIZE=32
-
- # New Features
- DHDCFLAGS += -DWL11U
- DHDCFLAGS += -DDHD_ENABLE_LPC
- DHDCFLAGS += -DCUSTOM_PSPRETEND_THR=30
-endif
-
-#EXTRA_LDFLAGS += --strip-debug
-#qs.xiong
-DHDCFLAGS += -Wno-array-bounds -Wno-sizeof-pointer-memaccess -Wno-unused-function
-
-
-ifeq ($(DRIVER_TYPE),y)
- DHDCFLAGS += -DENABLE_INSMOD_NO_FW_LOAD
- DHDCFLAGS += -DUSE_LATE_INITCALL_SYNC
- # Use kernel strlcpy() implementation instead of one, defined in bcmstdlib_s.c
- DHDCFLAGS += -DBCM_USE_PLATFORM_STRLCPY
-endif
-
-DHDOFILES += dhd_pno.o dhd_common.o dhd_ip.o dhd_custom_gpio.o \
- dhd_linux.o dhd_linux_sched.o dhd_cfg80211.o dhd_linux_wq.o aiutils.o \
- bcmevent.o bcmutils.o bcmwifi_channels.o hndpmu.o linux_osl.o linux_pkt.o \
- sbutils.o siutils.o wl_android.o wl_roam.o wl_cfg80211.o wl_cfgscan.o wl_cfgp2p.o \
- wl_cfg_btcoex.o wldev_common.o dhd_linux_platdev.o \
- dhd_pno.o dhd_linux_pktdump.o wl_cfg_btcoex.o hnd_pktq.o \
- hnd_pktpool.o wl_cfgvendor.o bcmxtlv.o bcm_app_utils.o dhd_debug.o \
- dhd_debug_linux.o dhd_mschdbg.o bcmbloom.o dhd_dbg_ring.o bcmstdlib_s.o \
- dhd_linux_exportfs.o wl_twt.o
-
-ifneq ($(CONFIG_DHD_MONITOR_INTERFACE),)
- DHDCFLAGS += -DDHD_MONITOR_INTERFACE
- DHDOFILES += wl_linux_mon.o
-endif
-
-ifneq ($(CONFIG_DHD_OF_SUPPORT),)
- DHDCFLAGS += -DDHD_OF_SUPPORT
- DHDOFILES += dhd_custom_msm.o
-ifneq ($(CONFIG_BROADCOM_WIFI_RESERVED_MEM),)
- DHDOFILES += dhd_custom_memprealloc.o
-endif
-endif
-
-ifeq ($(CONFIG_BCMDHD_SDMMC),y)
- DHDOFILES += bcmsdh_sdmmc.o bcmsdh_sdmmc_linux.o
-endif
-
-ifeq ($(CONFIG_BCMDHD_SDIO),y)
- DHDOFILES += bcmsdh.o bcmsdh_linux.o
- DHDOFILES += dhd_cdc.o dhd_wlfc.o dhd_sdio.o
-endif
-
-ifeq ($(CONFIG_BCMDHD_SDIOH_STD),y)
- DHDOFILES += bcmsdstd.o bcmsdstd_linux.o
-endif
-
-ifneq ($(CONFIG_BCMDHD_PCIE),)
- DHDOFILES += dhd_pcie.o dhd_pcie_linux.o dhd_msgbuf.o dhd_flowring.o
- DHDOFILES += pcie_core.o
-endif
-
-ifneq ($(filter -DDHD_LB, $(DHDCFLAGS)),)
-DHDOFILES += dhd_linux_lb.o
-endif
-ifneq ($(filter -DDHD_BANDSTEER, $(DHDCFLAGS)),)
- DHDOFILES += dhd_bandsteer.o
-endif
-
-ifneq ($(CONFIG_QT),y)
- DHDCFLAGS += -DRTT_SUPPORT -DRTT_DEBUG
- DHDOFILES += dhd_rtt.o
-endif
-EXTRA_CFLAGS += $(DHDCFLAGS) -DDHD_DEBUG
-EXTRA_CFLAGS += -DSRCBASE=\"$(src)\"
-EXTRA_CFLAGS += -I$(src)/bcmdhd/include/ -I$(src)/bcmdhd/
-KBUILD_CFLAGS += -I$(KDIR)/include -I$(CURDIR)
-
-bcmdhd_no_hwnat-objs := $(addprefix bcmdhd/, $(DHDOFILES))
-obj-$(DRIVER_TYPE) += bcmdhd_no_hwnat.o
-
-$(info, "this is info")
-$(info, $(bcmdhd_no_hwnat-objs))
-$(error, "error: this will stop the compile")
-
-all:
- @echo "$(MAKE) --no-print-directory -C $(KDIR) M=$(CURDIR) modules"
- @$(MAKE) --no-print-directory -C $(KDIR) M=$(CURDIR) modules
-
-clean:
- rm -rf *.o *.ko *.mod.c *~ .*.cmd *.o.cmd .*.o.cmd \
- Module.symvers modules.order .tmp_versions modules.builtin
-
-install:
- @$(MAKE) --no-print-directory -C $(KDIR) \
- SUBDIRS=$(CURDIR) modules_install
diff --git a/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd_no_hwnat/bcmdhd b/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd_no_hwnat/bcmdhd
deleted file mode 120000
index e68b802..0000000
--- a/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd_no_hwnat/bcmdhd
+++ /dev/null
@@ -1 +0,0 @@
-../bcmdhd
\ No newline at end of file