--- drivers/net/wireless/bcmdhd/Makefile

+++ drivers/net/wireless/bcmdhd/Makefile

@@ -21,6 +21,9 @@ DHDCFLAGS += -DBLOCK_IPV6_PACKET -DPASS_

DHDCFLAGS += -DSUPPORT_DEEP_SLEEP

DHDCFLAGS += -DSIMPLE_MAC_PRINT

+# Print out kernel panic point of file and line info when assertion happened

+DHDCFLAGS += -DBCMASSERT_LOG

+

# For p2p connection issue

DHDCFLAGS += -DWL_CFG80211_GON_COLLISION

DHDCFLAGS += -DWL_SCB_TIMEOUT=10

@@ -65,6 +68,15 @@ DHDCFLAGS += -DCUSTOM_DPC_PRIO_SETTING=9

# WiFi turn off delay

DHDCFLAGS += -DWIFI_TURNOFF_DELAY=100

+# DTIM listen interval in suspend mode(0 means follow AP's DTIM period)

+DHDCFLAGS += -DCUSTOM_SUSPEND_BCN_LI_DTIM=0

+

+# Priority mismatch fix with kernel stack

+DHDCFLAGS += -DPKTPRIO_OVERRIDE

+

+# Ioctl timeout 5000ms

+DHDCFLAGS += -DIOCTL_RESP_TIMEOUT=5000

+

# WiFi Kernel thread type

DHDCFLAGS += -DUSE_KTHREAD_API

@@ -82,14 +94,13 @@ DHDCFLAGS += -DWL_CFG80211_STA_EVENT

ifneq ($(CONFIG_BCM4334),)

DHDCFLAGS += -DBCM4334_CHIP -DHW_OOB -DSUPPORT_MULTIPLE_REVISION

DHDCFLAGS += -DUSE_CID_CHECK -DCONFIG_CONTROL_PM

- DHDCFLAGS += -DPROP_TXSTATUS

+ DHDCFLAGS += -DPROP_TXSTATUS -DPROP_TXSTATUS_VSDB

DHDCFLAGS += -DVSDB -DHT40_GO

DHDCFLAGS += -DWL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST

DHDCFLAGS += -DDHD_USE_IDLECOUNT

DHDCFLAGS += -DSUPPORT_AMPDU_MPDU_CMD

- DHDCFLAGS += -DVSDB_DYNAMIC_F2_BLKSIZE -DSDIO_F2_BLKSIZE=512 -DVSDB_F2_BLKSIZE=64

+ DHDCFLAGS += -DUSE_DYNAMIC_F2_BLKSIZE -DDYNAMIC_F2_BLKSIZE_FOR_NONLEGACY=64

DHDCFLAGS += -DCUSTOM_GLOM_SETTING=5 -DENABLE_BCN_LI_BCN_WAKEUP

-# DHDCFLAGS += -DUSE_WEP_AUTH_SHARED_OPEN

DHDCFLAGS += -DROAM_AP_ENV_DETECTION

DHDCFLAGS += -DWES_SUPPORT

endif

@@ -100,19 +111,21 @@ ifneq ($(CONFIG_BCM4330),)

DHDCFLAGS += -DCONFIG_CONTROL_PM

DHDCFLAGS += -DCUSTOM_GLOM_SETTING=0

DHDCFLAGS += -DPASS_ARP_PACKET

+ DHDCFLAGS += -DWL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST

endif

ifneq ($(CONFIG_BCM43241),)

DHDCFLAGS += -DBCM43241_CHIP -DHW_OOB

- DHDCFLAGS += -DMCAST_LIST_ACCUMULATION

- DHDCFLAGS += -DMIMO_ANT_SETTING -DCONFIG_CONTROL_PM

- DHDCFLAGS += -DAMPDU_HOSTREORDER -DDHD_USE_IDLECOUNT

- DHDCFLAGS += -DCUSTOM_GLOM_SETTING=1

+ DHDCFLAGS += -DCONFIG_CONTROL_PM

DHDCFLAGS += -DPROP_TXSTATUS

DHDCFLAGS += -DVSDB -DHT40_GO

DHDCFLAGS += -DWL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST

+ DHDCFLAGS += -DDHD_USE_IDLECOUNT

DHDCFLAGS += -DSUPPORT_AMPDU_MPDU_CMD

+ DHDCFLAGS += -DMIMO_ANT_SETTING -DAMPDU_HOSTREORDER

+ DHDCFLAGS += -DCUSTOM_GLOM_SETTING=1 -DCUSTOM_SDIO_F2_BLKSIZE=128

DHDCFLAGS += -DROAM_AP_ENV_DETECTION

+ DHDCFLAGS += -DSDIO_CRC_ERROR_FIX

ifeq ($(CONFIG_BCM43241),m)

DHDCFLAGS += -fno-pic

endif

@@ -123,16 +136,17 @@ endif

#############################

ifeq ($(CONFIG_SPI_SC8810),y)

-DHDCFLAGS += -DREAD_MACADDR -DBCMSPI -DBCMSPI_ANDROID -DSPI_PIO_32BIT_RW -DSPI_PIO_RW_BIGENDIAN -DDISABLE_11N

+ DHDCFLAGS += -DREAD_MACADDR -DBCMSPI -DBCMSPI_ANDROID -DSPI_PIO_32BIT_RW -DSPI_PIO_RW_BIGENDIAN

+ DHDCFLAGS += -UCUSTOM_DPC_PRIO_SETTING

-#Remove defines for SDMMC

-DHDCFLAGS :=$(filter-out -DOOB_INTR_ONLY,$(DHDCFLAGS))

-DHDCFLAGS :=$(filter-out -DBCMLXSDMMC,$(DHDCFLAGS))

-

-#Remove defines for JB

-DHDCFLAGS :=$(filter-out -DWL_ENABLE_P2P_IF,$(DHDCFLAGS))

-DHDCFLAGS :=$(filter-out -DMULTIPLE_SUPPLICANT,$(DHDCFLAGS))

-DHDCFLAGS :=$(filter-out -DWL_CFG80211_STA_EVENT,$(DHDCFLAGS))

+ #Remove defines for SDMMC

+ DHDCFLAGS :=$(filter-out -DOOB_INTR_ONLY,$(DHDCFLAGS))

+ DHDCFLAGS :=$(filter-out -DBCMLXSDMMC,$(DHDCFLAGS))

+

+ #Remove defines for JB

+ DHDCFLAGS :=$(filter-out -DWL_ENABLE_P2P_IF,$(DHDCFLAGS))

+ DHDCFLAGS :=$(filter-out -DMULTIPLE_SUPPLICANT,$(DHDCFLAGS))

+ DHDCFLAGS :=$(filter-out -DWL_CFG80211_STA_EVENT,$(DHDCFLAGS))

endif

#For INITIAL 2G scan features

@@ -182,6 +196,7 @@ endif

DHDCFLAGS += -DWLAN_REGION_CODE=$(REGION_CODE)

+DHDCFLAGS += -include "dhd_sec_feature.h"

##############################################################

#########