CONFIG_BCMDHD_SDIO := y
#CONFIG_BCMDHD_PCIE := y
-DHDCFLAGS = -Wall -Wstrict-prototypes -Dlinux -DBCMDRIVER \
+DHDCFLAGS = -Wall -Wstrict-prototypes -Dlinux -DBCMDRIVER -DSDTEST \
-DBCMDONGLEHOST -DUNRELEASEDCHIP -DBCMDMA32 -DBCMFILEIMAGE \
- -DDHDTHREAD -DDHD_DEBUG -DSHOW_EVENTS -DBCMDBG \
- -DWIFI_ACT_FRAME -DARP_OFFLOAD_SUPPORT \
- -DKEEP_ALIVE -DPKT_FILTER_SUPPORT -DDHD_USE_IDLECOUNT \
- -DEMBEDDED_PLATFORM -DPNO_SUPPORT -DVSDB \
- -DWL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST \
- -DESCAN_RESULT_PATCH -DSUPPORT_PM2_ONLY -DWLTDLS \
+ -DDHDTHREAD -DDHD_DEBUG -DSHOW_EVENTS -DBCMDBG -DGET_OTP_MAC_ENABLE \
+ -DWIFI_ACT_FRAME -DARP_OFFLOAD_SUPPORT -DSUPPORT_PM2_ONLY \
+ -DKEEP_ALIVE -DPKT_FILTER_SUPPORT -DPNO_SUPPORT -DDHDTCPACK_SUPPRESS \
-DDHD_DONOT_FORWARD_BCMEVENT_AS_NETWORK_PKT -DRXFRAME_THREAD \
- -DMIRACAST_AMPDU_SIZE=8 -DDHDTCPACK_SUPPRESS \
- -DSDTEST -DBDC -DDHD_BCMEVENTS -DPROP_TXSTATUS_VSDB \
- -DGET_OTP_MAC_ENABLE -DSET_RANDOM_MAC_SOFTAP \
+ -DSET_RANDOM_MAC_SOFTAP \
-DENABLE_INSMOD_NO_FW_LOAD \
-Idrivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd \
-Idrivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/include
ifneq ($(CONFIG_BCMDHD_SDIO),)
DHDCFLAGS += \
- -DMMC_SDIO_ABORT -DBCMSDIO -DBCMLXSDMMC -DSDIO_CRC_ERROR_FIX \
- -DCUSTOM_SDIO_F2_BLKSIZE=128 -DUSE_SDIOFIFO_IOVAR -DBCMSDIOH_TXGLOM \
- -DPROP_TXSTATUS
+ -DBCMSDIO -DMMC_SDIO_ABORT -DBCMLXSDMMC -DUSE_SDIOFIFO_IOVAR \
+ -DBDC -DPROP_TXSTATUS -DDHD_USE_IDLECOUNT -DBCMSDIOH_TXGLOM \
+ -DCUSTOM_SDIO_F2_BLKSIZE=128
DHDOFILES += bcmsdh.o bcmsdh_linux.o bcmsdh_sdmmc.o bcmsdh_sdmmc_linux.o \
dhd_sdio.o dhd_cdc.o dhd_wlfc.o
DHDCFLAGS += -DCUSTOM_PNO_EVENT_LOCK_xTIME=7
DHDCFLAGS += -DWL_SUPPORT_AUTO_CHANNEL
DHDCFLAGS += -DWL_SUPPORT_BACKPORTED_KPATCHES
+DHDCFLAGS += -DESCAN_RESULT_PATCH
+DHDCFLAGS += -DVSDB -DWL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST
+DHDCFLAGS += -DWLTDLS -DMIRACAST_AMPDU_SIZE=8 -DPROP_TXSTATUS_VSDB
endif
EXTRA_CFLAGS = $(DHDCFLAGS)
ifeq ($(CONFIG_BCMDHD),m)
#if defined(DISABLE_WOWLAN)
SDLX_MSG(("%s: disable_irq_wake\n", __FUNCTION__));
- err = disable_irq_wake(bcmsdh_osinfo->oob_irq_num);
- if (err)
- SDLX_MSG(("%s: disable_irq_wake failed with %d\n", __FUNCTION__, err));
- else
- bcmsdh_osinfo->oob_irq_wake_enabled = FALSE;
+ bcmsdh_osinfo->oob_irq_wake_enabled = FALSE;
#else
SDLX_MSG(("%s: enable_irq_wake\n", __FUNCTION__));
err = enable_irq_wake(bcmsdh_osinfo->oob_irq_num);
struct sdio_func *func = dev_to_sdio_func(pdev);
mmc_pm_flag_t sdio_flags;
- printk("%s Enter func->num=%d\n", __FUNCTION__, func->num);
+ printf("%s Enter func->num=%d\n", __FUNCTION__, func->num);
if (func->num != 2)
return 0;
sdioh = sdio_get_drvdata(func);
err = bcmsdh_suspend(sdioh->bcmsdh);
if (err) {
- printk("%s bcmsdh_suspend err=%d\n", __FUNCTION__, err);
+ printf("%s bcmsdh_suspend err=%d\n", __FUNCTION__, err);
return err;
}
dhd_mmc_suspend = TRUE;
smp_mb();
- printk("%s Exit\n", __FUNCTION__);
+ printf("%s Exit\n", __FUNCTION__);
return 0;
}
#endif
struct sdio_func *func = dev_to_sdio_func(pdev);
- printk("%s Enter func->num=%d\n", __FUNCTION__, func->num);
+ printf("%s Enter func->num=%d\n", __FUNCTION__, func->num);
if (func->num != 2)
return 0;
#endif
smp_mb();
- printk("%s Exit\n", __FUNCTION__);
+ printf("%s Exit\n", __FUNCTION__);
return 0;
}
for (n=1; n<len; n++) {
if (varbuf[n] == '\n')
break;
- printf("%c", varbuf[n]);
+ printk("%c", varbuf[n]);
}
- printf("\n");
+ printk("\n");
}
for (n = 0; n < len; n++) {
#include <wlioctl.h>
#include <wlfc_proto.h>
+#include <hnd_pktq.h>
#if defined(BCMWDF)
#include <wdf.h>
struct dhd_prot;
struct dhd_info;
struct dhd_ioctl;
-struct pktq;
/* The level of bus communication with the dongle */
enum dhd_bus_state {
break;
case IOV_GVAL(IOV_WLMSGLEVEL):
- printk("android_msg_level=0x%x\n", android_msg_level);
- printk("config_msg_level=0x%x\n", config_msg_level);
+ printf("android_msg_level=0x%x\n", android_msg_level);
+ printf("config_msg_level=0x%x\n", config_msg_level);
#if defined(WL_WIRELESS_EXT)
int_val = (int32)iw_msg_level;
bcopy(&int_val, arg, val_size);
- printk("iw_msg_level=0x%x\n", iw_msg_level);
+ printf("iw_msg_level=0x%x\n", iw_msg_level);
#endif
#ifdef WL_CFG80211
int_val = (int32)wl_dbg_level;
bcopy(&int_val, arg, val_size);
- printk("cfg_msg_level=0x%x\n", wl_dbg_level);
+ printf("cfg_msg_level=0x%x\n", wl_dbg_level);
#endif
break;
case IOV_SVAL(IOV_WLMSGLEVEL):
if (int_val & DHD_ANDROID_VAL) {
android_msg_level = (uint)(int_val & 0xFFFF);
- printk("android_msg_level=0x%x\n", android_msg_level);
+ printf("android_msg_level=0x%x\n", android_msg_level);
}
if (int_val & DHD_CONFIG_VAL) {
config_msg_level = (uint)(int_val & 0xFFFF);
- printk("config_msg_level=0x%x\n", config_msg_level);
+ printf("config_msg_level=0x%x\n", config_msg_level);
}
#if defined(WL_WIRELESS_EXT)
if (int_val & DHD_IW_VAL) {
iw_msg_level = (uint)(int_val & 0xFFFF);
- printk("iw_msg_level=0x%x\n", iw_msg_level);
+ printf("iw_msg_level=0x%x\n", iw_msg_level);
}
#endif
#ifdef WL_CFG80211
void\r
dhd_conf_free_mac_list(wl_mac_list_ctrl_t *mac_list)\r
{\r
- CONFIG_TRACE(("%s called\n", __FUNCTION__));\r
+ int i;\r
\r
+ CONFIG_TRACE(("%s called\n", __FUNCTION__));\r
if (mac_list->m_mac_list_head) {\r
- CONFIG_TRACE(("%s Free %p\n", __FUNCTION__, mac_list->m_mac_list_head));\r
- if (mac_list->m_mac_list_head->mac) {\r
- CONFIG_TRACE(("%s Free %p\n", __FUNCTION__, mac_list->m_mac_list_head->mac));\r
- kfree(mac_list->m_mac_list_head->mac);\r
+ for (i=0; i<mac_list->count; i++) {\r
+ if (mac_list->m_mac_list_head[i].mac) {\r
+ CONFIG_TRACE(("%s Free mac %p\n", __FUNCTION__, mac_list->m_mac_list_head[i].mac));\r
+ kfree(mac_list->m_mac_list_head[i].mac);\r
+ }\r
}\r
+ CONFIG_TRACE(("%s Free m_mac_list_head %p\n", __FUNCTION__, mac_list->m_mac_list_head));\r
kfree(mac_list->m_mac_list_head);\r
}\r
mac_list->count = 0;\r
if (config_msg_level & CONFIG_TRACE_LEVEL) {\r
printf("%s: tpl_code=0x%02x, tpl_link=0x%02x, tag=0x%02x\n",\r
__FUNCTION__, tpl_code, tpl_link, *ptr);\r
- printf("%s: value:", __FUNCTION__);\r
+ printk("%s: value:", __FUNCTION__);\r
for (i=0; i<tpl_link-1; i++) {\r
- printf("%02x ", ptr[i+1]);\r
- if ((i+1)%16==0)\r
- printf("\n");\r
+ printk("%02x ", ptr[i+1]);\r
+ if ((i+1) % 16 == 0)\r
+ printk("\n");\r
}\r
- printf("\n");\r
+ printk("\n");\r
}\r
\r
if (tpl_code == 0x80 && tpl_link == 0x07 && *ptr == 0x19)\r
\r
/* find out the last '/' */\r
i = strlen(fw_path);\r
- while (i>0){\r
+ while (i > 0) {\r
if (fw_path[i] == '/') break;\r
i--;\r
}\r
\r
/* find out the last '/' */\r
i = strlen(nv_path);\r
- while (i>0){\r
+ while (i > 0) {\r
if (nv_path[i] == '/') break;\r
i--;\r
}\r
\r
/* find out the last '/' */\r
i = strlen(fw_path);\r
- while (i>0){\r
+ while (i > 0) {\r
if (fw_path[i] == '/') break;\r
i--;\r
}\r
- j = strlen(nv_path);
- while (j>0){
- if (nv_path[j] == '/') break;
- j--;
- }
+ j = strlen(nv_path);\r
+ while (j>0){\r
+ if (nv_path[j] == '/') break;\r
+ j--;\r
+ }\r
#ifdef BAND_AG\r
ag_type = FW_TYPE_AG;\r
#else\r
strcpy(&fw_path[i+1], bcm43362a0_fw_name[fw_type]);\r
else\r
strcpy(&fw_path[i+1], bcm43362a2_fw_name[fw_type]);\r
- strcpy(&nv_path[j+1], "nvram_AP6210.txt");\r
+ if (strstr(nv_path, "6476") == NULL)\r
+ strcpy(&nv_path[j+1], "nvram_AP6210.txt");\r
break;\r
case BCM43430_CHIP_ID:\r
if (chiprev == BCM43430A0_CHIP_REV)\r
case BCM4324_CHIP_ID:\r
if (chiprev == BCM43241B4_CHIP_REV)\r
strcpy(&fw_path[i+1], bcm43241b4_ag_fw_name[fw_type]);\r
- strcpy(&nv_path[j+1], "nvram_ap62x2.txt");
+ strcpy(&nv_path[j+1], "nvram_ap62x2.txt");\r
break;\r
case BCM4335_CHIP_ID:\r
if (chiprev == BCM4335A0_CHIP_REV)\r
case BCM4339_CHIP_ID:\r
if (chiprev == BCM4339A0_CHIP_REV)\r
strcpy(&fw_path[i+1], bcm4339a0_ag_fw_name[fw_type]);\r
- strcpy(&nv_path[j+1], "nvram_AP6335.txt");
+ strcpy(&nv_path[j+1], "nvram_AP6335.txt");\r
break;\r
case BCM4354_CHIP_ID:\r
if (chiprev == BCM4354A1_CHIP_REV) {\r
strcpy(&nv_path[j+1], "nvram_ap6356.txt"); \r
}\r
break;\r
+ case BCM4356_CHIP_ID:\r
+ if (chiprev == BCM4356A2_CHIP_REV)\r
+ strcpy(&fw_path[i+1], bcm4356a2_ag_fw_name[fw_type]);\r
+ break;\r
+ case BCM4371_CHIP_ID:\r
+ if (chiprev == BCM4356A2_CHIP_REV)\r
+ strcpy(&fw_path[i+1], bcm4356a2_ag_fw_name[fw_type]);\r
+ break;\r
#endif\r
#ifdef BCMPCIE\r
case BCM4356_CHIP_ID:\r
#endif\r
}\r
\r
- printk("%s: firmware_path=%s,nv_path=%s\n", __FUNCTION__, fw_path, nv_path);\r
+ printf("%s: firmware_path=%s\n", __FUNCTION__, fw_path);\r
}\r
\r
void\r
\r
/* find out the last '/' */\r
i = strlen(nv_path);\r
- while (i>0){\r
+ while (i > 0) {\r
if (nv_path[i] == '/') break;\r
i--;\r
}\r
- \r
+\r
strcpy(&nv_path[i+1], dhd->conf->nv_by_chip.m_chip_nv_path_head[matched].name);\r
\r
printf("%s: nvram_path=%s\n", __FUNCTION__, nv_path);\r
\r
/* find out the last '/' */\r
i = strlen(conf_path);\r
- while (i>0){\r
+ while (i > 0) {\r
if (conf_path[i] == '/') break;\r
i--;\r
}\r
int i;\r
\r
/*\r
- All pkt: pkt_filter_add=99 0 0 0 0x000000000000 0x000000000000\r
- Netbios pkt: 120 0 0 12 0xFFFF000000000000000000FF000000000000000000000000FFFF 0x0800000000000000000000110000000000000000000000000089\r
- */\r
+ * All pkt: pkt_filter_add=99 0 0 0 0x000000000000 0x000000000000\r
+ * Netbios pkt: 120 0 0 12 0xFFFF000000000000000000FF000000000000000000000000FFFF 0x0800000000000000000000110000000000000000000000000089\r
+ */\r
for(i=0; i<dhd->conf->pkt_filter_add.count; i++) {\r
dhd->pktfilter[i+dhd->pktfilter_count] = dhd->conf->pkt_filter_add.filter[i];\r
printf("%s: %s\n", __FUNCTION__, dhd->pktfilter[i+dhd->pktfilter_count]);\r
int i;\r
\r
if (dhd && dhd->conf) {\r
- for(i=0; i<dhd->conf->pkt_filter_del.count; i++) {\r
+ for (i=0; i<dhd->conf->pkt_filter_del.count; i++) {\r
if (id == dhd->conf->pkt_filter_del.id[i]) {\r
printf("%s: %d\n", __FUNCTION__, dhd->conf->pkt_filter_del.id[i]);\r
return true;\r
\r
void\r
dhd_conf_set_disable_proptx(dhd_pub_t *dhd)\r
-{ \r
+{\r
printf("%s: set disable_proptx %d\n", __FUNCTION__, dhd->conf->disable_proptx);\r
disable_proptx = dhd->conf->disable_proptx;\r
}\r
\r
int\r
-dhd_conf_get_pm(void *context)\r
+dhd_conf_get_pm(dhd_pub_t *dhd)\r
{\r
- dhd_pub_t *dhd = context;\r
-\r
if (dhd && dhd->conf)\r
return dhd->conf->pm;\r
return -1;\r
}\r
\r
+int\r
+dhd_conf_get_tcpack_sup_mode(dhd_pub_t *dhd)\r
+{\r
+ if (dhd && dhd->conf)\r
+ return dhd->conf->tcpack_sup_mode;\r
+ return -1;\r
+}\r
+\r
unsigned int\r
process_config_vars(char *varbuf, unsigned int len, char *pickbuf, char *param)\r
{\r
\r
}\r
\r
+void\r
+dhd_conf_read_fw_by_mac(dhd_pub_t *dhd, char *bufp, uint len)\r
+{\r
+ uint len_val;\r
+ int i, j;\r
+ char pick[MAXSZ_BUF];\r
+ char *pch, *pick_tmp;\r
+ wl_mac_list_t *mac_list;\r
+ wl_mac_range_t *mac_range;\r
+ struct dhd_conf *conf = dhd->conf;\r
+\r
+ /* Process fw_by_mac:\r
+ * fw_by_mac=[fw_mac_num] \\r
+ * [fw_name1] [mac_num1] [oui1-1] [nic_start1-1] [nic_end1-1] \\r
+ * [oui1-1] [nic_start1-1] [nic_end1-1]... \\r
+ * [oui1-n] [nic_start1-n] [nic_end1-n] \\r
+ * [fw_name2] [mac_num2] [oui2-1] [nic_start2-1] [nic_end2-1] \\r
+ * [oui2-1] [nic_start2-1] [nic_end2-1]... \\r
+ * [oui2-n] [nic_start2-n] [nic_end2-n] \\r
+ * Ex: fw_by_mac=2 \\r
+ * fw_bcmdhd1.bin 2 0x0022F4 0xE85408 0xE8549D 0x983B16 0x3557A9 0x35582A \\r
+ * fw_bcmdhd2.bin 3 0x0022F4 0xE85408 0xE8549D 0x983B16 0x3557A9 0x35582A \\r
+ * 0x983B16 0x916157 0x916487\r
+ */\r
+ memset(pick, 0, MAXSZ_BUF);\r
+ len_val = process_config_vars(bufp, len, pick, "fw_by_mac=");\r
+ if (len_val) {\r
+ pick_tmp = pick;\r
+ pch = bcmstrtok(&pick_tmp, " ", 0);\r
+ conf->fw_by_mac.count = (uint32)simple_strtol(pch, NULL, 0);\r
+ if (!(mac_list = kmalloc(sizeof(wl_mac_list_t)*conf->fw_by_mac.count, GFP_KERNEL))) {\r
+ conf->fw_by_mac.count = 0;\r
+ CONFIG_ERROR(("%s: kmalloc failed\n", __FUNCTION__));\r
+ }\r
+ printf("%s: fw_count=%d\n", __FUNCTION__, conf->fw_by_mac.count);\r
+ conf->fw_by_mac.m_mac_list_head = mac_list;\r
+ for (i=0; i<conf->fw_by_mac.count; i++) {\r
+ pch = bcmstrtok(&pick_tmp, " ", 0);\r
+ strcpy(mac_list[i].name, pch);\r
+ pch = bcmstrtok(&pick_tmp, " ", 0);\r
+ mac_list[i].count = (uint32)simple_strtol(pch, NULL, 0);\r
+ printf("%s: name=%s, mac_count=%d\n", __FUNCTION__,\r
+ mac_list[i].name, mac_list[i].count);\r
+ if (!(mac_range = kmalloc(sizeof(wl_mac_range_t)*mac_list[i].count, GFP_KERNEL))) {\r
+ mac_list[i].count = 0;\r
+ CONFIG_ERROR(("%s: kmalloc failed\n", __FUNCTION__));\r
+ break;\r
+ }\r
+ mac_list[i].mac = mac_range;\r
+ for (j=0; j<mac_list[i].count; j++) {\r
+ pch = bcmstrtok(&pick_tmp, " ", 0);\r
+ mac_range[j].oui = (uint32)simple_strtol(pch, NULL, 0);\r
+ pch = bcmstrtok(&pick_tmp, " ", 0);\r
+ mac_range[j].nic_start = (uint32)simple_strtol(pch, NULL, 0);\r
+ pch = bcmstrtok(&pick_tmp, " ", 0);\r
+ mac_range[j].nic_end = (uint32)simple_strtol(pch, NULL, 0);\r
+ printf("%s: oui=0x%06X, nic_start=0x%06X, nic_end=0x%06X\n",\r
+ __FUNCTION__, mac_range[j].oui,\r
+ mac_range[j].nic_start, mac_range[j].nic_end);\r
+ }\r
+ }\r
+ }\r
+}\r
+\r
+void\r
+dhd_conf_read_nv_by_mac(dhd_pub_t *dhd, char *bufp, uint len)\r
+{\r
+ uint len_val;\r
+ int i, j;\r
+ char pick[MAXSZ_BUF];\r
+ char *pch, *pick_tmp;\r
+ wl_mac_list_t *mac_list;\r
+ wl_mac_range_t *mac_range;\r
+ struct dhd_conf *conf = dhd->conf;\r
+\r
+ /* Process nv_by_mac:\r
+ * [nv_by_mac]: The same format as fw_by_mac\r
+ */\r
+ memset(pick, 0, MAXSZ_BUF);\r
+ len_val = process_config_vars(bufp, len, pick, "nv_by_mac=");\r
+ if (len_val) {\r
+ pick_tmp = pick;\r
+ pch = bcmstrtok(&pick_tmp, " ", 0);\r
+ conf->nv_by_mac.count = (uint32)simple_strtol(pch, NULL, 0);\r
+ if (!(mac_list = kmalloc(sizeof(wl_mac_list_t)*conf->nv_by_mac.count, GFP_KERNEL))) {\r
+ conf->nv_by_mac.count = 0;\r
+ CONFIG_ERROR(("%s: kmalloc failed\n", __FUNCTION__));\r
+ }\r
+ printf("%s: nv_count=%d\n", __FUNCTION__, conf->nv_by_mac.count);\r
+ conf->nv_by_mac.m_mac_list_head = mac_list;\r
+ for (i=0; i<conf->nv_by_mac.count; i++) {\r
+ pch = bcmstrtok(&pick_tmp, " ", 0);\r
+ strcpy(mac_list[i].name, pch);\r
+ pch = bcmstrtok(&pick_tmp, " ", 0);\r
+ mac_list[i].count = (uint32)simple_strtol(pch, NULL, 0);\r
+ printf("%s: name=%s, mac_count=%d\n", __FUNCTION__,\r
+ mac_list[i].name, mac_list[i].count);\r
+ if (!(mac_range = kmalloc(sizeof(wl_mac_range_t)*mac_list[i].count, GFP_KERNEL))) {\r
+ mac_list[i].count = 0;\r
+ CONFIG_ERROR(("%s: kmalloc failed\n", __FUNCTION__));\r
+ break;\r
+ }\r
+ mac_list[i].mac = mac_range;\r
+ for (j=0; j<mac_list[i].count; j++) {\r
+ pch = bcmstrtok(&pick_tmp, " ", 0);\r
+ mac_range[j].oui = (uint32)simple_strtol(pch, NULL, 0);\r
+ pch = bcmstrtok(&pick_tmp, " ", 0);\r
+ mac_range[j].nic_start = (uint32)simple_strtol(pch, NULL, 0);\r
+ pch = bcmstrtok(&pick_tmp, " ", 0);\r
+ mac_range[j].nic_end = (uint32)simple_strtol(pch, NULL, 0);\r
+ printf("%s: oui=0x%06X, nic_start=0x%06X, nic_end=0x%06X\n",\r
+ __FUNCTION__, mac_range[j].oui,\r
+ mac_range[j].nic_start, mac_range[j].nic_end);\r
+ }\r
+ }\r
+ }\r
+}\r
+\r
+void\r
+dhd_conf_read_nv_by_chip(dhd_pub_t *dhd, char *bufp, uint len)\r
+{\r
+ uint len_val;\r
+ int i;\r
+ char pick[MAXSZ_BUF];\r
+ char *pch, *pick_tmp;\r
+ wl_chip_nv_path_t *chip_nv_path;\r
+ struct dhd_conf *conf = dhd->conf;\r
+\r
+ /* Process nv_by_chip:\r
+ * nv_by_chip=[nv_chip_num] \\r
+ * [chip1] [chiprev1] [nv_name1] [chip2] [chiprev2] [nv_name2] \\r
+ * Ex: nv_by_chip=2 \\r
+ * 43430 0 nvram_ap6212.txt 43430 1 nvram_ap6212a.txt \\r
+ */\r
+ memset(pick, 0, MAXSZ_BUF);\r
+ len_val = process_config_vars(bufp, len, pick, "nv_by_chip=");\r
+ if (len_val) {\r
+ pick_tmp = pick;\r
+ pch = bcmstrtok(&pick_tmp, " ", 0);\r
+ conf->nv_by_chip.count = (uint32)simple_strtol(pch, NULL, 0);\r
+ if (!(chip_nv_path = kmalloc(sizeof(wl_mac_list_t)*conf->nv_by_chip.count, GFP_KERNEL))) {\r
+ conf->nv_by_chip.count = 0;\r
+ CONFIG_ERROR(("%s: kmalloc failed\n", __FUNCTION__));\r
+ }\r
+ printf("%s: nv_by_chip_count=%d\n", __FUNCTION__, conf->nv_by_chip.count);\r
+ conf->nv_by_chip.m_chip_nv_path_head = chip_nv_path;\r
+ for (i=0; i<conf->nv_by_chip.count; i++) {\r
+ pch = bcmstrtok(&pick_tmp, " ", 0);\r
+ chip_nv_path[i].chip = (uint32)simple_strtol(pch, NULL, 0);\r
+ pch = bcmstrtok(&pick_tmp, " ", 0);\r
+ chip_nv_path[i].chiprev = (uint32)simple_strtol(pch, NULL, 0);\r
+ pch = bcmstrtok(&pick_tmp, " ", 0);\r
+ strcpy(chip_nv_path[i].name, pch);\r
+ printf("%s: chip=0x%x, chiprev=%d, name=%s\n", __FUNCTION__,\r
+ chip_nv_path[i].chip, chip_nv_path[i].chiprev, chip_nv_path[i].name);\r
+ }\r
+ }\r
+}\r
+\r
void\r
dhd_conf_read_roam_params(dhd_pub_t *dhd, char *bufp, uint len)\r
{\r
uint len_val;\r
char pick[MAXSZ_BUF];\r
struct dhd_conf *conf = dhd->conf;\r
- \r
+\r
/* Process roam */\r
memset(pick, 0, MAXSZ_BUF);\r
len_val = process_config_vars(bufp, len, pick, "roam_off=");\r
\r
}\r
\r
-/*\r
- * [fw_by_mac]:\r
- * fw_by_mac=[fw_mac_num] \\r
- * [fw_name1] [mac_num1] [oui1-1] [nic_start1-1] [nic_end1-1] \\r
- * [oui1-1] [nic_start1-1] [nic_end1-1]... \\r
- * [oui1-n] [nic_start1-n] [nic_end1-n] \\r
- * [fw_name2] [mac_num2] [oui2-1] [nic_start2-1] [nic_end2-1] \\r
- * [oui2-1] [nic_start2-1] [nic_end2-1]... \\r
- * [oui2-n] [nic_start2-n] [nic_end2-n] \\r
- * Ex: fw_by_mac=2 \\r
- * fw_bcmdhd1.bin 2 0x0022F4 0xE85408 0xE8549D 0x983B16 0x3557A9 0x35582A \\r
- * fw_bcmdhd2.bin 3 0x0022F4 0xE85408 0xE8549D 0x983B16 0x3557A9 0x35582A \\r
- * 0x983B16 0x916157 0x916487\r
- * [nv_by_mac]: The same format as fw_by_mac\r
- *\r
-*/\r
int\r
dhd_conf_read_config(dhd_pub_t *dhd, char *conf_path)\r
{\r
- int bcmerror = -1, i, j;\r
+ int bcmerror = -1, i;\r
uint len, len_val;\r
void * image = NULL;\r
char * memblock = NULL;\r
char *bufp, pick[MAXSZ_BUF], *pch, *pick_tmp;\r
bool conf_file_exists;\r
- wl_mac_list_t *mac_list;\r
- wl_mac_range_t *mac_range;\r
- wl_chip_nv_path_t *chip_nv_path;\r
struct dhd_conf *conf = dhd->conf;\r
\r
conf_file_exists = ((conf_path != NULL) && (conf_path[0] != '\0'));\r
dhd_conf_read_log_level(dhd, bufp, len);\r
dhd_conf_read_roam_params(dhd, bufp, len);\r
dhd_conf_read_wme_ac_params(dhd, bufp, len);
+ dhd_conf_read_fw_by_mac(dhd, bufp, len);\r
+ dhd_conf_read_nv_by_mac(dhd, bufp, len);\r
+ dhd_conf_read_nv_by_chip(dhd, bufp, len);\r
\r
- /* Process fw_by_mac */\r
- memset(pick, 0, MAXSZ_BUF);\r
- len_val = process_config_vars(bufp, len, pick, "fw_by_mac=");\r
- if (len_val) {\r
- pick_tmp = pick;\r
- pch = bcmstrtok(&pick_tmp, " ", 0);\r
- conf->fw_by_mac.count = (uint32)simple_strtol(pch, NULL, 0);\r
- if (!(mac_list = kmalloc(sizeof(wl_mac_list_t)*conf->fw_by_mac.count, GFP_KERNEL))) {\r
- conf->fw_by_mac.count = 0;\r
- CONFIG_ERROR(("%s: kmalloc failed\n", __FUNCTION__));\r
- }\r
- printf("%s: fw_count=%d\n", __FUNCTION__, conf->fw_by_mac.count);\r
- conf->fw_by_mac.m_mac_list_head = mac_list;\r
- for (i=0; i<conf->fw_by_mac.count; i++) {\r
- pch = bcmstrtok(&pick_tmp, " ", 0);\r
- strcpy(mac_list[i].name, pch);\r
- pch = bcmstrtok(&pick_tmp, " ", 0);\r
- mac_list[i].count = (uint32)simple_strtol(pch, NULL, 0);\r
- printf("%s: name=%s, mac_count=%d\n", __FUNCTION__,\r
- mac_list[i].name, mac_list[i].count);\r
- if (!(mac_range = kmalloc(sizeof(wl_mac_range_t)*mac_list[i].count, GFP_KERNEL))) {\r
- mac_list[i].count = 0;\r
- CONFIG_ERROR(("%s: kmalloc failed\n", __FUNCTION__));\r
- break;\r
- }\r
- mac_list[i].mac = mac_range;\r
- for (j=0; j<mac_list[i].count; j++) {\r
- pch = bcmstrtok(&pick_tmp, " ", 0);\r
- mac_range[j].oui = (uint32)simple_strtol(pch, NULL, 0);\r
- pch = bcmstrtok(&pick_tmp, " ", 0);\r
- mac_range[j].nic_start = (uint32)simple_strtol(pch, NULL, 0);\r
- pch = bcmstrtok(&pick_tmp, " ", 0);\r
- mac_range[j].nic_end = (uint32)simple_strtol(pch, NULL, 0);\r
- printf("%s: oui=0x%06X, nic_start=0x%06X, nic_end=0x%06X\n",\r
- __FUNCTION__, mac_range[j].oui,\r
- mac_range[j].nic_start, mac_range[j].nic_end);\r
- }\r
- }\r
- }\r
-\r
- /* Process nv_by_mac */\r
- memset(pick, 0, MAXSZ_BUF);\r
- len_val = process_config_vars(bufp, len, pick, "nv_by_mac=");\r
- if (len_val) {\r
- pick_tmp = pick;\r
- pch = bcmstrtok(&pick_tmp, " ", 0);\r
- conf->nv_by_mac.count = (uint32)simple_strtol(pch, NULL, 0);\r
- if (!(mac_list = kmalloc(sizeof(wl_mac_list_t)*conf->nv_by_mac.count, GFP_KERNEL))) {\r
- conf->nv_by_mac.count = 0;\r
- CONFIG_ERROR(("%s: kmalloc failed\n", __FUNCTION__));\r
- }\r
- printf("%s: nv_count=%d\n", __FUNCTION__, conf->nv_by_mac.count);\r
- conf->nv_by_mac.m_mac_list_head = mac_list;\r
- for (i=0; i<conf->nv_by_mac.count; i++) {\r
- pch = bcmstrtok(&pick_tmp, " ", 0);\r
- strcpy(mac_list[i].name, pch);\r
- pch = bcmstrtok(&pick_tmp, " ", 0);\r
- mac_list[i].count = (uint32)simple_strtol(pch, NULL, 0);\r
- printf("%s: name=%s, mac_count=%d\n", __FUNCTION__,\r
- mac_list[i].name, mac_list[i].count);\r
- if (!(mac_range = kmalloc(sizeof(wl_mac_range_t)*mac_list[i].count, GFP_KERNEL))) {\r
- mac_list[i].count = 0;\r
- CONFIG_ERROR(("%s: kmalloc failed\n", __FUNCTION__));\r
- break;\r
- }\r
- mac_list[i].mac = mac_range;\r
- for (j=0; j<mac_list[i].count; j++) {\r
- pch = bcmstrtok(&pick_tmp, " ", 0);\r
- mac_range[j].oui = (uint32)simple_strtol(pch, NULL, 0);\r
- pch = bcmstrtok(&pick_tmp, " ", 0);\r
- mac_range[j].nic_start = (uint32)simple_strtol(pch, NULL, 0);\r
- pch = bcmstrtok(&pick_tmp, " ", 0);\r
- mac_range[j].nic_end = (uint32)simple_strtol(pch, NULL, 0);\r
- printf("%s: oui=0x%06X, nic_start=0x%06X, nic_end=0x%06X\n",\r
- __FUNCTION__, mac_range[j].oui,\r
- mac_range[j].nic_start, mac_range[j].nic_end);\r
- }\r
- }\r
- }\r
-\r
- /* Process nv_by_chip */\r
- memset(pick, 0, MAXSZ_BUF);\r
- len_val = process_config_vars(bufp, len, pick, "nv_by_chip=");\r
- if (len_val) {\r
- pick_tmp = pick;\r
- pch = bcmstrtok(&pick_tmp, " ", 0);\r
- conf->nv_by_chip.count = (uint32)simple_strtol(pch, NULL, 0);\r
- if (!(chip_nv_path = kmalloc(sizeof(wl_mac_list_t)*conf->nv_by_chip.count, GFP_KERNEL))) {\r
- conf->nv_by_chip.count = 0;\r
- CONFIG_ERROR(("%s: kmalloc failed\n", __FUNCTION__));\r
- }\r
- printf("%s: nv_by_chip_count=%d\n", __FUNCTION__, conf->nv_by_chip.count);\r
- conf->nv_by_chip.m_chip_nv_path_head = chip_nv_path;\r
- for (i=0; i<conf->nv_by_chip.count; i++) {\r
- pch = bcmstrtok(&pick_tmp, " ", 0);\r
- chip_nv_path[i].chip = (uint32)simple_strtol(pch, NULL, 0);\r
- pch = bcmstrtok(&pick_tmp, " ", 0);\r
- chip_nv_path[i].chiprev = (uint32)simple_strtol(pch, NULL, 0);\r
- pch = bcmstrtok(&pick_tmp, " ", 0);\r
- strcpy(chip_nv_path[i].name, pch);\r
- printf("%s: chip=0x%x, chiprev=%d, name=%s\n", __FUNCTION__,\r
- chip_nv_path[i].chip, chip_nv_path[i].chiprev, chip_nv_path[i].name);\r
- }\r
- }\r
-\r
- /* Process band */\r
+ /* Process band:\r
+ * band=a for 5GHz only and band=b for 2.4GHz only\r
+ */\r
memset(pick, 0, MAXSZ_BUF);\r
len_val = process_config_vars(bufp, len, pick, "band=");\r
if (len_val) {\r
printf("%s: dhd_master_mode = %d\n", __FUNCTION__, dhd_master_mode);\r
}\r
\r
- /* Process pkt_filter_add */\r
+#ifdef PKT_FILTER_SUPPORT\r
+ /* Process pkt_filter_add:\r
+ * All pkt: pkt_filter_add=99 0 0 0 0x000000000000 0x000000000000\r
+ */\r
memset(pick, 0, MAXSZ_BUF);\r
len_val = process_config_vars(bufp, len, pick, "pkt_filter_add=");\r
pick_tmp = pick;\r
printf("%d ", conf->pkt_filter_del.id[i]);\r
printf("\n");\r
}\r
+#endif\r
\r
/* Process srl parameters */\r
memset(pick, 0, MAXSZ_BUF);\r
printf("%s: ampdu_ba_wsize = %d\n", __FUNCTION__, conf->ampdu_ba_wsize);\r
}\r
\r
- /* Process kso parameters */\r
+ /* Process kso_enable parameters */\r
memset(pick, 0, MAXSZ_BUF);\r
len_val = process_config_vars(bufp, len, pick, "kso_enable=");\r
if (len_val) {\r
printf("%s: PM = %d\n", __FUNCTION__, conf->pm);\r
}\r
\r
+ /* Process tcpack_sup_mode parameters */\r
+ memset(pick, 0, MAXSZ_BUF);\r
+ len_val = process_config_vars(bufp, len, pick, "tcpack_sup_mode=");\r
+ if (len_val) {\r
+ conf->tcpack_sup_mode = (int)simple_strtol(pick, NULL, 10);\r
+ printf("%s: tcpack_sup_mode = %d\n", __FUNCTION__, conf->tcpack_sup_mode);\r
+ }\r
+\r
bcmerror = 0;\r
} else {\r
CONFIG_ERROR(("%s: error reading config file: %d\n", __FUNCTION__, len));\r
strcpy(conf->cspec.ccode, "ALL");\r
conf->cspec.rev = 0;\r
} else if (conf->chip == BCM4335_CHIP_ID || conf->chip == BCM4339_CHIP_ID ||\r
- conf->chip == BCM4354_CHIP_ID) {\r
+ conf->chip == BCM4354_CHIP_ID || conf->chip == BCM4356_CHIP_ID ||\r
+ conf->chip == BCM4345_CHIP_ID || conf->chip == BCM4371_CHIP_ID) {\r
strcpy(conf->cspec.country_abbrev, "CN");\r
strcpy(conf->cspec.ccode, "CN");\r
conf->cspec.rev = 38;\r
conf->frameburst = -1;\r
conf->deepsleep = FALSE;\r
conf->pm = -1;\r
+ conf->tcpack_sup_mode = TCPACK_SUP_OFF;\r
if ((conf->chip == BCM43362_CHIP_ID) || (conf->chip == BCM4330_CHIP_ID)) {\r
conf->disable_proptx = 1;\r
conf->use_rxchain = 0;\r
+ }\r
+ if (conf->chip == BCM43430_CHIP_ID) {\r
+ conf->bus_rxglom = FALSE;\r
+ conf->use_rxchain = 0;\r
}
if (conf->chip == BCM4339_CHIP_ID) {\r
conf->txbf = 1;\r
if (conf->chip == BCM4356_CHIP_ID) {\r
conf->txbf = 1;\r
}\r
- if (conf->chip == BCM43430_CHIP_ID) {
- conf->bus_rxglom = FALSE;
- conf->use_rxchain = 0;
- }
+ if (conf->chip == BCM4371_CHIP_ID) {\r
+ conf->txbf = 1;\r
+ }\r
+#ifdef BCMSDIO\r
+ if (conf->chip == BCM4356_CHIP_ID) {\r
+ conf->txbf = 1;\r
+ }\r
+#elif defined(BCMPCIE)\r
+ if (conf->chip == BCM4356_CHIP_ID) {\r
+ conf->txbf = 1;\r
+ }\r
+#endif\r
\r
return 0;\r
}\r
#ifdef PKT_FILTER_SUPPORT\r
#define DHD_CONF_FILTER_MAX 8\r
/* filter list */\r
-#define PKT_FILTER_LEN 150\r
+#define PKT_FILTER_LEN 300\r
typedef struct conf_pkt_filter_add {\r
/* in - # of channels, out - # of entries */\r
uint32 count;\r
int frameburst;\r
bool deepsleep;\r
int pm;\r
+ uint8 tcpack_sup_mode;\r
} dhd_conf_t;\r
\r
#ifdef BCMSDIO\r
int dhd_conf_set_chiprev(dhd_pub_t *dhd, uint chip, uint chiprev);\r
uint dhd_conf_get_chip(void *context);\r
uint dhd_conf_get_chiprev(void *context);\r
-int dhd_conf_get_pm(void *context);\r
+int dhd_conf_get_pm(dhd_pub_t *dhd);\r
+int dhd_conf_get_tcpack_sup_mode(dhd_pub_t *dhd);\r
int dhd_conf_preinit(dhd_pub_t *dhd);\r
int dhd_conf_reset(dhd_pub_t *dhd);\r
int dhd_conf_attach(dhd_pub_t *dhd);\r
host_oob_irq = rockchip_wifi_get_oob_irq();
- printk("host_oob_irq: %d \r\n", host_oob_irq);
+ printf("host_oob_irq: %d \r\n", host_oob_irq);
return host_oob_irq;
}
uint host_oob_irq_flags = 0;
host_oob_irq_flags = (IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL | IORESOURCE_IRQ_SHAREABLE) & IRQF_TRIGGER_MASK;
- printk("host_oob_irq_flags=%d\n", host_oob_irq_flags);
+ printf("host_oob_irq_flags=%d\n", host_oob_irq_flags);
return host_oob_irq_flags;
}
int err = 0;
if (on) {
- printk("======== PULL WL_REG_ON HIGH! ========\n");
+ printf("======== PULL WL_REG_ON HIGH! ========\n");
rockchip_wifi_power(1);
} else {
- printk("======== PULL WL_REG_ON LOW! ========\n");
+ printf("======== PULL WL_REG_ON LOW! ========\n");
rockchip_wifi_power(0);
}
int err = 0;
if (present) {
- printk("======== Card detection to detect SDIO card! ========\n");
+ printf("======== Card detection to detect SDIO card! ========\n");
rockchip_wifi_set_carddetect(1);
} else {
- printk("======== Card detection to remove SDIO card! ========\n");
+ printf("======== Card detection to remove SDIO card! ========\n");
rockchip_wifi_set_carddetect(0);
}
int bcm_wlan_get_mac_address(unsigned char *buf)
{
int err = 0;
-
- printk("======== %s ========\n", __FUNCTION__);
+
+ printf("======== %s ========\n", __FUNCTION__);
#ifdef EXAMPLE_GET_MAC
/* EXAMPLE code */
{
void *alloc_ptr = NULL;
alloc_ptr = bcmdhd_mem_prealloc(section, size);
if (alloc_ptr) {
- printk("success alloc section %d, size %ld\n", section, size);
+ printf("success alloc section %d, size %ld\n", section, size);
if (size != 0L)
bzero(alloc_ptr, size);
return alloc_ptr;
}
- printk("can't alloc section %d\n", section);
+ printf("can't alloc section %d\n", section);
return NULL;
}
#endif
int bcm_wlan_set_plat_data(void) {
- printk("======== %s ========\n", __FUNCTION__);
+ printf("======== %s ========\n", __FUNCTION__);
dhd_wlan_control.set_power = bcm_wlan_set_power;
dhd_wlan_control.set_carddetect = bcm_wlan_set_carddetect;
dhd_wlan_control.get_mac_addr = bcm_wlan_get_mac_address;
dhd_info_t *dhd = DHD_DEV_INFO(net);
DHD_OS_WAKE_LOCK(&dhd->pub);
DHD_PERIM_LOCK(&dhd->pub);
- printk("%s: Enter %p\n", __FUNCTION__, net);
+ printf("%s: Enter %p\n", __FUNCTION__, net);
if (dhd->pub.up == 0) {
goto exit;
}
dhd->pub.dhd_cspec.ccode[0] = 0x00;
}
- printk("%s: Exit\n", __FUNCTION__);
+ printf("%s: Exit\n", __FUNCTION__);
DHD_PERIM_UNLOCK(&dhd->pub);
DHD_OS_WAKE_UNLOCK(&dhd->pub);
return 0;
int ifidx;
int32 ret = 0;
- printk("%s: Enter %p\n", __FUNCTION__, net);
+ printf("%s: Enter %p\n", __FUNCTION__, net);
#if defined(MULTIPLE_SUPPLICANT)
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) && 1
if (mutex_is_locked(&_dhd_sdio_mutex_lock_) != 0) {
#endif
#endif /* MULTIPLE_SUPPLICANT */
- printk("%s: Exit ret=%d\n", __FUNCTION__, ret);
+ printf("%s: Exit ret=%d\n", __FUNCTION__, ret);
return ret;
}
DHD_TRACE(("Enter %s\n", __FUNCTION__));
dhd_conf_set_band(dhd);
+ printf("%s: Set tcpack_sup_mode %d\n", __FUNCTION__, dhd->conf->tcpack_sup_mode);
+ dhd_tcpack_suppress_set(dhd, dhd->conf->tcpack_sup_mode);
dhd->op_mode = 0;
if ((!op_mode && dhd_get_fw_mode(dhd->info) == DHD_FLAG_MFG_MODE) ||
bcm_mkiovar("cur_etheraddr", (void *)&ea_addr, ETHER_ADDR_LEN, buf, sizeof(buf));
ret = dhd_wl_ioctl_cmd(dhd, WLC_SET_VAR, buf, sizeof(buf), TRUE, 0);
if (ret < 0) {
- DHD_ERROR(("%s: can't set MAC address , error=%d\n", __FUNCTION__, ret));
+ DHD_ERROR(("%s: can't set MAC address MAC="MACDBG", error=%d\n",
+ __FUNCTION__, MAC2STRDBG(ea_addr.octet), ret));
ret = BCME_NOTUP;
goto done;
}
setbit(eventmask, WLC_E_TXFAIL);
#endif
setbit(eventmask, WLC_E_JOIN_START);
- setbit(eventmask, WLC_E_SCAN_COMPLETE);
+// setbit(eventmask, WLC_E_SCAN_COMPLETE); // terence 20150628: remove redundant event
#ifdef WLMEDIA_HTSF
setbit(eventmask, WLC_E_HTSFSYNC);
#endif /* WLMEDIA_HTSF */
static void
dhd_module_cleanup(void)
{
- printk("%s: Enter\n", __FUNCTION__);
+ printf("%s: Enter\n", __FUNCTION__);
dhd_bus_unregister();
wl_android_exit();
dhd_wifi_platform_unregister_drv();
- printk("%s: Exit\n", __FUNCTION__);
+ printf("%s: Exit\n", __FUNCTION__);
}
static void
int err;
int retry = POWERUP_MAX_RETRY;
- printk("%s: in\n", __FUNCTION__);
+ printf("%s: in\n", __FUNCTION__);
DHD_PERIM_RADIO_INIT();
if (err)
DHD_ERROR(("%s: Failed to load driver max retry reached**\n", __FUNCTION__));
- printk("%s: Exit err=%d\n", __FUNCTION__, err);
+ printf("%s: Exit err=%d\n", __FUNCTION__, err);
return err;
}
int type = get_wifi_chip_type();
if (type > WIFI_AP6XXX_SERIES) return 0;
#endif
- printk("=======================================================\n");
- printk("==== Launching Wi-Fi driver! (Powered by Rockchip) ====\n");
- printk("=======================================================\n");
- printk("%s WiFi driver (Powered by Rockchip,Ver %s) init.\n", WIFI_MODULE_NAME, RKWIFI_DRV_VERSION);
+ printf("=======================================================\n");
+ printf("==== Launching Wi-Fi driver! (Powered by Rockchip) ====\n");
+ printf("=======================================================\n");
+ printf("%s WiFi driver (Powered by Rockchip,Ver %s) init.\n", WIFI_MODULE_NAME, RKWIFI_DRV_VERSION);
#ifdef CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP
{
struct task_struct *kthread = kthread_run(wifi_init_thread, NULL, "wifi_init_thread");
if (kthread->pid < 0)
- printk("create wifi_init_thread failed.\n");
+ printf("create wifi_init_thread failed.\n");
return 0;
}
#else
int type = get_wifi_chip_type();
if (type > WIFI_AP6XXX_SERIES) return;
#endif
- printk("=======================================================\n");
- printk("== Dis-launching Wi-Fi driver! (Powered by Rockchip) ==\n");
- printk("=======================================================\n");
+ printf("=======================================================\n");
+ printf("== Dis-launching Wi-Fi driver! (Powered by Rockchip) ==\n");
+ printf("=======================================================\n");
dhd_module_exit();
}
#else
static bool dts_enabled = FALSE;
struct resource dhd_wlan_resources = {0};
+#ifdef CUSTOMER_HW
struct wifi_platform_data dhd_wlan_control = {0};
+#endif
#endif /* !defind(DHD_OF_SUPPORT) */
#endif /* !defind(CONFIG_DTS) */
#if !defined(CONFIG_DTS)
if (dts_enabled) {
- adapter->wifi_plat_data = (void *)&dhd_wlan_control;
#ifdef CUSTOMER_HW
+ adapter->wifi_plat_data = (void *)&dhd_wlan_control;
bcm_wlan_set_plat_data();
#ifdef CUSTOMER_OOB
adapter->irq_num = bcm_wlan_get_oob_irq();
dhd_conf_preinit(bus->dhd);
dhd_conf_read_config(bus->dhd, bus->dhd->conf_path);
dhd_conf_set_fw_name_by_chip(bus->dhd, bus->fw_path);
+ dhd_conf_set_nv_name_by_chip(bus->dhd, bus->nv_path);
- printk("Final fw_path=%s\n", bus->fw_path);
- printk("Final nv_path=%s\n", bus->nv_path);
- printk("Final conf_path=%s\n", bus->dhd->conf_path);
+ printf("Final fw_path=%s\n", bus->fw_path);
+ printf("Final nv_path=%s\n", bus->nv_path);
+ printf("Final conf_path=%s\n", bus->dhd->conf_path);
ret = _dhdpcie_download_firmware(bus);
*/
image = dhd_os_open_image(pfw_path);
if (image == NULL) {
- printk("%s: Open firmware file failed %s\n", __FUNCTION__, pfw_path);
+ printf("%s: Open firmware file failed %s\n", __FUNCTION__, pfw_path);
goto err;
}
if (nvram_file_exists) {
image = dhd_os_open_image(pnv_path);
if (image == NULL) {
- printk("%s: Open nvram file failed %s\n", __FUNCTION__, pnv_path);
+ printf("%s: Open nvram file failed %s\n", __FUNCTION__, pnv_path);
goto err;
}
}
#ifdef DHDENABLE_TAILPAD
void *pad_pkt;
#endif /* DHDENABLE_TAILPAD */
+ uint txglomframes; /* Number of tx glom frames (superframes) */
+ uint txglompkts; /* Number of packets from tx glom frames */
} dhd_bus_t;
/* clkstate */
(bus->sih->chip == BCM4354_CHIP_ID) ||
(bus->sih->chip == BCM4356_CHIP_ID) ||
(bus->sih->chip == BCM4358_CHIP_ID) ||
+ (bus->sih->chip == BCM4371_CHIP_ID) ||
(BCM4349_CHIP(bus->sih->chip)) ||
(bus->sih->chip == BCM4350_CHIP_ID)) {
core_capext = TRUE;
(bus->sih->chip == BCM4354_CHIP_ID) ||
(bus->sih->chip == BCM4356_CHIP_ID) ||
(bus->sih->chip == BCM4358_CHIP_ID) ||
+ (bus->sih->chip == BCM4371_CHIP_ID) ||
(bus->sih->chip == BCM4350_CHIP_ID)) {
uint32 enabval = 0;
addr = SI_ENUM_BASE + OFFSETOF(chipcregs_t, chipcontrol_addr);
(bus->sih->chip == BCM4345_CHIP_ID) ||
(bus->sih->chip == BCM4354_CHIP_ID) ||
(bus->sih->chip == BCM4356_CHIP_ID) ||
- (bus->sih->chip == BCM4358_CHIP_ID))
+ (bus->sih->chip == BCM4358_CHIP_ID) ||
+ (bus->sih->chip == BCM4371_CHIP_ID))
enabval &= CC_CHIPCTRL3_SR_ENG_ENABLE;
if (enabval)
break;
if (dhdsdio_txpkt(bus, SDPCM_DATA_CHANNEL, pkts, i, TRUE) != BCME_OK)
dhd->tx_errors++;
- else
+ else {
dhd->dstats.tx_bytes += datalen;
+ bus->txglomframes++;
+ bus->txglompkts += num_pkt;
+ }
cnt += i;
/* In poll mode, need to check for other events */
#endif /* DHD_DEBUG */
bcm_bprintf(strbuf, "clkstate %d activity %d idletime %d idlecount %d sleeping %d\n",
bus->clkstate, bus->activity, bus->idletime, bus->idlecount, bus->sleeping);
+ dhd_dump_pct(strbuf, "Tx: glom pct", (100 * bus->txglompkts), bus->dhd->tx_packets);
+ dhd_dump_pct(strbuf, ", pkts/glom", bus->txglompkts, bus->txglomframes);
+ bcm_bprintf(strbuf, "\n");
+ bcm_bprintf(strbuf, "txglomframes %u, txglompkts %u\n", bus->txglomframes, bus->txglompkts);
+ bcm_bprintf(strbuf, "\n");
}
void
bus->tx_sderrs = bus->fc_rcvd = bus->fc_xoff = bus->fc_xon = 0;
bus->rxglomfail = bus->rxglomframes = bus->rxglompkts = 0;
bus->f2rxhdrs = bus->f2rxdata = bus->f2txdata = bus->f1regdata = 0;
+ bus->txglomframes = bus->txglompkts = 0;
}
#ifdef SDTEST
} else
#endif /* BCMSDIOH_TXGLOM */
bus->txglom_enable = FALSE;
- printk("%s: enable %d\n", __FUNCTION__, bus->txglom_enable);
+ printf("%s: enable %d\n", __FUNCTION__, bus->txglom_enable);
}
int
dhd_os_sdunlock(bus->dhd);
dhd_rx_frame(bus->dhd, ifidx, pkt, pkt_count, chan);
dhd_os_sdlock(bus->dhd);
+#if defined(SDIO_ISR_THREAD)
+ /* terence 20150615: fix for below error due to bussleep in watchdog after dhd_os_sdunlock here,
+ * so call BUS_WAKE to wake up bus again
+ * dhd_bcmsdh_recv_buf: Device asleep
+ * dhdsdio_readframes: RXHEADER FAILED: -40
+ * dhdsdio_rxfail: abort command, terminate frame, send NAK
+ */
+ BUS_WAKE(bus);
+#endif
}
rxcount = maxframes - rxleft;
#ifdef DHD_DEBUG
#if defined(SDIO_ISR_THREAD)
DHD_TRACE(("Calling dhdsdio_dpc() from %s\n", __FUNCTION__));
DHD_OS_WAKE_LOCK(bus->dhd);
- /* terence 20150209: dpc should be scheded again if dpc_sched is TRUE or dhd_bus_txdata can
+ /* terence 20150209: dpc should be scheded again if dpc_sched is TRUE or dhd_bus_txdata can
not schedule anymore because dpc_sched is TRUE now.
*/
if (dhdsdio_dpc(bus)) {
return TRUE;
if (chipid == BCM4358_CHIP_ID)
return TRUE;
+ if (chipid == BCM4371_CHIP_ID)
+ return TRUE;
if (chipid == BCM43430_CHIP_ID)
return TRUE;
if (BCM4349_CHIP(chipid))
case BCM4354_CHIP_ID:
case BCM4356_CHIP_ID:
case BCM4358_CHIP_ID:
+ case BCM4371_CHIP_ID:
bus->dongle_ram_base = CR4_4350_RAM_BASE;
break;
case BCM4360_CHIP_ID:
dhd_conf_set_fw_name_by_mac(bus->dhd, bus->sdh, bus->fw_path);
dhd_conf_set_nv_name_by_mac(bus->dhd, bus->sdh, bus->nv_path);
- printk("Final fw_path=%s\n", bus->fw_path);
- printk("Final nv_path=%s\n", bus->nv_path);
- printk("Final conf_path=%s\n", bus->dhd->conf_path);
+ printf("Final fw_path=%s\n", bus->fw_path);
+ printf("Final nv_path=%s\n", bus->nv_path);
+ printf("Final conf_path=%s\n", bus->dhd->conf_path);
ret = _dhdsdio_download_firmware(bus);
image = dhd_os_open_image(pfw_path);
if (image == NULL) {
- printk("%s: Open firmware file failed %s\n", __FUNCTION__, pfw_path);
+ printf("%s: Open firmware file failed %s\n", __FUNCTION__, pfw_path);
goto err;
}
if (nvram_file_exists) {
image = dhd_os_open_image(pnv_path);
if (image == NULL) {
- printk("%s: Open nvram file failed %s\n", __FUNCTION__, pnv_path);
+ printf("%s: Open nvram file failed %s\n", __FUNCTION__, pnv_path);
goto err;
}
}
dhd_txglom_enable(dhdp, FALSE);
dhd_os_sdunlock(dhdp);
- printk("%s: WLAN OFF DONE\n", __FUNCTION__);
+ printf("%s: WLAN OFF DONE\n", __FUNCTION__);
/* App can now remove power from device */
} else
bcmerror = BCME_SDIO_ERROR;
} else {
/* App must have restored power to device before calling */
- printk("\n\n%s: == WLAN ON ==\n", __FUNCTION__);
+ printf("\n\n%s: == WLAN ON ==\n", __FUNCTION__);
if (bus->dhd->dongle_reset) {
/* Turn on WLAN */
dhd_os_sdunlock(dhdp);
} else {
bcmerror = BCME_SDIO_ERROR;
- printk("%s called when dongle is not in reset\n",
+ printf("%s called when dongle is not in reset\n",
__FUNCTION__);
- printk("Will call dhd_bus_start instead\n");
+ printf("Will call dhd_bus_start instead\n");
dhd_bus_resume(dhdp, 1);
#if defined(HW_OOB)
dhd_conf_set_hw_oob_intr(bus->sdh, bus->sih->chip); // terence 20120615: fix for OOB initial issue
#include <linux/module.h>\r
#include <linux/kernel.h>\r
-#include <linux/init.h> \r
-#include <linux/platform_device.h> \r
-#include <linux/delay.h> \r
-#include <linux/err.h> \r
-#include <linux/skbuff.h> \r
-#include <linux/wlan_plat.h> \r
+#include <linux/init.h>\r
+#include <linux/platform_device.h>\r
+#include <linux/delay.h>\r
+#include <linux/err.h>\r
+#include <linux/skbuff.h>\r
+#include <linux/wlan_plat.h>\r
\r
#define CONFIG_BROADCOM_WIFI_RESERVED_MEM\r
\r
#define WLAN_STATIC_SCAN_BUF0 5\r
#define WLAN_STATIC_SCAN_BUF1 6\r
#define WLAN_STATIC_DHD_INFO 7\r
-#define PREALLOC_WLAN_SEC_NUM 5\r
+#define WLAN_STATIC_DHD_WLFC_INFO 8\r
+#define PREALLOC_WLAN_SEC_NUM 6\r
#define PREALLOC_WLAN_BUF_NUM 160\r
#define PREALLOC_WLAN_SECTION_HEADER 24\r
\r
#define WLAN_SECTION_SIZE_2 (PREALLOC_WLAN_BUF_NUM * 512)\r
#define WLAN_SECTION_SIZE_3 (PREALLOC_WLAN_BUF_NUM * 1024)\r
#define WLAN_SECTION_SIZE_7 (PREALLOC_WLAN_BUF_NUM * 128)\r
+#define WLAN_SECTION_SIZE_8 (PREALLOC_WLAN_BUF_NUM * 512)\r
\r
#define DHD_SKB_HDRSIZE 336\r
#define DHD_SKB_1PAGE_BUFSIZE ((PAGE_SIZE*1)-DHD_SKB_HDRSIZE)\r
{NULL, (WLAN_SECTION_SIZE_1 + PREALLOC_WLAN_SECTION_HEADER)},\r
{NULL, (WLAN_SECTION_SIZE_2 + PREALLOC_WLAN_SECTION_HEADER)},\r
{NULL, (WLAN_SECTION_SIZE_3 + PREALLOC_WLAN_SECTION_HEADER)},\r
- {NULL, (WLAN_SECTION_SIZE_7 + PREALLOC_WLAN_SECTION_HEADER)}\r
+ {NULL, (WLAN_SECTION_SIZE_7 + PREALLOC_WLAN_SECTION_HEADER)},\r
+ {NULL, (WLAN_SECTION_SIZE_8 + PREALLOC_WLAN_SECTION_HEADER)}\r
};\r
\r
void *wlan_static_scan_buf0;\r
__FUNCTION__, section, wlan_mem_array[4].mem_ptr);\r
return wlan_mem_array[4].mem_ptr;\r
}\r
+ if (section == WLAN_STATIC_DHD_WLFC_INFO) {\r
+ printk("5 %s: section=%d, wlan_mem_array[5]=%p\n",\r
+ __FUNCTION__, section, wlan_mem_array[5].mem_ptr);\r
+ return wlan_mem_array[5].mem_ptr;\r
+ }\r
if ((section < 0) || (section > PREALLOC_WLAN_SEC_NUM)) {\r
- printk("5 %s: out of section %d\n", __FUNCTION__, section);\r
+ printk("6 %s: out of section %d\n", __FUNCTION__, section);\r
return NULL;\r
}\r
\r
if (wlan_mem_array[section].size < size) {\r
- printk("6 %s: wlan_mem_array[section].size=%lu, size=%lu\n",\r
+ printk("7 %s: wlan_mem_array[section].size=%lu, size=%lu\n",\r
__FUNCTION__, wlan_mem_array[section].size, size);\r
return NULL;\r
}\r
- printk("7 %s: wlan_mem_array[section].mem_ptr=%p, size=%lu\n",\r
+ printk("8 %s: wlan_mem_array[section].mem_ptr=%p, size=%lu\n",\r
__FUNCTION__, &wlan_mem_array[section], size);\r
\r
return wlan_mem_array[section].mem_ptr;\r
\r
EXPORT_SYMBOL(bcmdhd_mem_prealloc);\r
\r
-int bcmdhd_init_wlan_mem(void) \r
+int bcmdhd_init_wlan_mem(void)\r
{\r
int i;\r
int j;\r
for (i=0; i<8; i++) {\r
wlan_static_skb[i] = dev_alloc_skb(DHD_SKB_1PAGE_BUFSIZE);\r
if (!wlan_static_skb[i])\r
- goto err_skb_alloc; \r
+ goto err_skb_alloc;\r
printk("1 %s: wlan_static_skb[%d]=%p, size=%lu\n",\r
__FUNCTION__, i, wlan_static_skb[i], DHD_SKB_1PAGE_BUFSIZE);\r
}\r
for (; i<16; i++) {\r
wlan_static_skb[i] = dev_alloc_skb(DHD_SKB_2PAGE_BUFSIZE);\r
if (!wlan_static_skb[i])\r
- goto err_skb_alloc; \r
+ goto err_skb_alloc;\r
printk("2 %s: wlan_static_skb[%d]=%p, size=%lu\n",\r
__FUNCTION__, i, wlan_static_skb[i], DHD_SKB_2PAGE_BUFSIZE);\r
}\r
\r
wlan_static_skb[i] = dev_alloc_skb(DHD_SKB_4PAGE_BUFSIZE);\r
if (!wlan_static_skb[i])\r
- goto err_skb_alloc; \r
+ goto err_skb_alloc;\r
printk("3 %s: wlan_static_skb[%d]=%p, size=%lu\n",\r
__FUNCTION__, i, wlan_static_skb[i], DHD_SKB_4PAGE_BUFSIZE);\r
\r
}\r
\r
wlan_static_scan_buf0 = kmalloc (65536, GFP_KERNEL);\r
- if(!wlan_static_scan_buf0)\r
+ if (!wlan_static_scan_buf0)\r
goto err_mem_alloc;\r
printk("5 %s: wlan_static_scan_buf0=%p, size=%d\n",\r
__FUNCTION__, wlan_static_scan_buf0, 65536);\r
\r
wlan_static_scan_buf1 = kmalloc (65536, GFP_KERNEL);\r
- if(!wlan_static_scan_buf1)\r
+ if (!wlan_static_scan_buf1)\r
goto err_mem_alloc;\r
printk("6 %s: wlan_static_scan_buf1=%p, size=%d\n",\r
__FUNCTION__, wlan_static_scan_buf1, 65536);\r
#define BCM43569_CHIP_ID 0xAA31 /* 43569 chipcommon chipid */
#define BCM43570_CHIP_ID 0xAA32 /* 43570 chipcommon chipid */
#define BCM4358_CHIP_ID 0x4358 /* 4358 chipcommon chipid */
+#define BCM4371_CHIP_ID 0x4371 /* 4371 chipcommon chipid */
#define BCM4350_CHIP(chipid) ((CHIPID(chipid) == BCM4350_CHIP_ID) || \
(CHIPID(chipid) == BCM4354_CHIP_ID) || \
(CHIPID(chipid) == BCM4356_CHIP_ID) || \
#define EPI_VERSION_DEV 1.201.59
/* Driver Version String, ASCII, 32 chars max */
-#define EPI_VERSION_STR "1.201.59.4 (r506368)"
+#define EPI_VERSION_STR "1.201.59.5 (r506368)"
#endif /* _epivers_h_ */
#define CMD_MIRACAST "MIRACAST"
#define CMD_NAN "NAN_"
#define CMD_GET_CHANNEL "GET_CHANNEL"
-#define CMD_SET_ROAM "SET_ROAM_TRIGGER"
+#define CMD_SET_ROAM "SET_ROAM_TRIGGER"
#define CMD_GET_ROAM "GET_ROAM_TRIGGER"
#define CMD_GET_KEEP_ALIVE "GET_KEEP_ALIVE"
#define CMD_GET_PM "GET_PM"
return -EINVAL;
}
- printk("%s in 1\n", __FUNCTION__);
+ printf("%s in 1\n", __FUNCTION__);
dhd_net_if_lock(dev);
- printk("%s in 2: g_wifi_on=%d\n", __FUNCTION__, g_wifi_on);
+ printf("%s in 2: g_wifi_on=%d\n", __FUNCTION__, g_wifi_on);
if (!g_wifi_on) {
do {
dhd_net_wifi_platform_set_power(dev, TRUE, WIFI_TURNON_DELAY);
}
exit:
- printk("%s: Success\n", __FUNCTION__);
+ printf("%s: Success\n", __FUNCTION__);
dhd_net_if_unlock(dev);
return ret;
dhd_net_bus_devreset(dev, TRUE);
dhd_net_bus_suspend(dev);
dhd_net_wifi_platform_set_power(dev, FALSE, WIFI_TURNOFF_DELAY);
- printk("%s: Failed\n", __FUNCTION__);
+ printf("%s: Failed\n", __FUNCTION__);
dhd_net_if_unlock(dev);
return ret;
#endif
return -EINVAL;
}
- printk("%s in 1\n", __FUNCTION__);
+ printf("%s in 1\n", __FUNCTION__);
dhd_net_if_lock(dev);
- printk("%s in 2: g_wifi_on=%d\n", __FUNCTION__, g_wifi_on);
+ printf("%s in 2: g_wifi_on=%d\n", __FUNCTION__, g_wifi_on);
if (g_wifi_on) {
#if defined(BCMSDIO) || defined(BCMPCIE)
ret = dhd_net_bus_devreset(dev, TRUE);
dhd_net_wifi_platform_set_power(dev, FALSE, WIFI_TURNOFF_DELAY);
g_wifi_on = FALSE;
}
- printk("%s out\n", __FUNCTION__);
+ printf("%s out\n", __FUNCTION__);
dhd_net_if_unlock(dev);
return ret;
sscanf(command, "%*s %10d", &roam_trigger[0]);
roam_trigger[1] = WLC_BAND_ALL;
-
+
ret = wldev_ioctl(dev, WLC_SET_ROAM_TRIGGER, roam_trigger, sizeof(roam_trigger), 1);
if (ret)
ANDROID_ERROR(("WLC_SET_ROAM_TRIGGER ERROR %d ret=%d\n", roam_trigger[0], ret));
int bytes_written;
int roam_trigger[2] = {0, 0};
int trigger[2]= {0, 0};
-
+
roam_trigger[1] = WLC_BAND_2G;
ret = wldev_ioctl(dev, WLC_GET_ROAM_TRIGGER, roam_trigger, sizeof(roam_trigger), 0);
if (!ret)
trigger[0] = roam_trigger[0];
- else
+ else
ANDROID_ERROR(("2G WLC_GET_ROAM_TRIGGER ERROR %d ret=%d\n", roam_trigger[0], ret));
roam_trigger[1] = WLC_BAND_5G;
ret = wldev_ioctl(dev, WLC_GET_ROAM_TRIGGER, roam_trigger, sizeof(roam_trigger), 0);
if (!ret)
trigger[1] = roam_trigger[0];
- else
+ else
ANDROID_ERROR(("5G WLC_GET_ROAM_TRIGGER ERROR %d ret=%d\n", roam_trigger[0], ret));
-
+
ANDROID_TRACE(("roam_trigger %d %d\n", trigger[0], trigger[1]));
bytes_written = snprintf(command, total_len, "%d %d", trigger[0], trigger[1]);
if (!memcmp(&node->BSSID, &bssid, ETHER_ADDR_LEN)) {
ANDROID_INFO(("%s: Update %d with BSSID %pM, RSSI=%d\n",
__FUNCTION__, k, &bssid, rssi));
- for(j=0; j<RSSIAVG_LEN-1; j++)
+ for (j=0; j<RSSIAVG_LEN-1; j++)
node->RSSI[j] = node->RSSI[j+1];
node->RSSI[j] = rssi;
node->dirty = 0;
if (!memcmp(&node->BSSID, &bi->BSSID, ETHER_ADDR_LEN)) {
ANDROID_INFO(("%s: Update %d with BSSID %pM, RSSI=%d, SSID \"%s\"\n",
__FUNCTION__, k, &bi->BSSID, dtoh16(bi->RSSI), bi->SSID));
- for(j=0; j<RSSIAVG_LEN-1; j++)
+ for (j=0; j<RSSIAVG_LEN-1; j++)
node->RSSI[j] = node->RSSI[j+1];
node->RSSI[j] = dtoh16(bi->RSSI);
node->dirty = 0;
node = *bss_head;
prev = NULL;
bi = bi ? (wl_bss_info_t *)((uintptr)bi + dtoh32(bi->length)) : ss_list->bss_info;
-
+
for (;node;) {
if (!memcmp(&node->results.bss_info->BSSID, &bi->BSSID, ETHER_ADDR_LEN)) {
- tmp = node;
+ tmp = node;
leaf = kmalloc(dtoh32(bi->length) + WLC_IW_SS_CACHE_CTRL_FIELD_MAXLEN, GFP_KERNEL);
if (!leaf) {
ANDROID_ERROR(("%s: Memory alloc failure %d and keep old BSS info\n",
static s32 wl_cfg80211_change_station(struct wiphy *wiphy,
struct net_device *dev, u8 *mac, struct station_parameters *params);
#endif /* WL_SUPPORT_BACKPORTED_KPATCHES || KERNEL_VER >= KERNEL_VERSION(3, 2, 0)) */
-static s32
+static s32
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)) || defined(WL_COMPAT_WIRELESS)
wl_cfg80211_suspend(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
#else
chspec = wl_cfg80211_get_shared_freq(wiphy);
wlif_type = WL_P2P_IF_GO;
- printk("%s : ap (%d), infra (%d), iftype: (%d)\n",
+ printf("%s : ap (%d), infra (%d), iftype: (%d)\n",
ndev->name, ap, infra, type);
wl_set_p2p_status(cfg, IF_CHANGING);
wl_clr_p2p_status(cfg, IF_CHANGED);
err = wldev_iovar_setbuf_bsscfg(dev, "join", ext_join_params, join_params_size,
cfg->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &cfg->ioctl_buf_sync);
- printk("Connectting with " MACDBG " channel (%d) ssid \"%s\", len (%d)\n\n",
+ printf("Connectting with " MACDBG " channel (%d) ssid \"%s\", len (%d)\n\n",
MAC2STRDBG((u8*)(&ext_join_params->assoc.bssid)), cfg->channel,
ext_join_params->ssid.SSID, ext_join_params->ssid.SSID_len);
dev = ndev_to_wlc_ndev(dev, cfg);
#endif
_chan = ieee80211_frequency_to_channel(chan->center_freq);
- printk("netdev_ifidx(%d), chan_type(%d) target channel(%d) \n",
+ printf("netdev_ifidx(%d), chan_type(%d) target channel(%d) \n",
dev->ifindex, channel_type, _chan);
#ifdef CUSTOM_PLATFORM_NV_TEGRA
sizeof(scb_val_t), true);
if (err < 0)
WL_ERR(("WLC_SCB_DEAUTHENTICATE_FOR_REASON err %d\n", err));
- printk("Disconnect STA : %s scb_val.val %d\n",
+ printf("Disconnect STA : %s scb_val.val %d\n",
bcm_ether_ntoa((const struct ether_addr *)mac_addr, eabuf),
scb_val.val);
return -EINVAL;
}
channel = ieee80211_get_channel(wiphy, freq);
+ WL_SCAN(("BSSID %pM, channel %d, rssi %d, capa 0x04%x, mgmt_type %d, "
+ "frame_len %d, SSID \"%s\"\n", &bi->BSSID, notif_bss_info->channel,
+ notif_bss_info->rssi, mgmt->u.beacon.capab_info, mgmt_type,
+ notif_bss_info->frame_len, bi->SSID));
if (unlikely(!channel)) {
WL_ERR(("ieee80211_get_channel error, freq=%d, channel=%d\n",
freq, notif_bss_info->channel));
kfree(notif_bss_info);
return -EINVAL;
}
- WL_SCAN(("BSSID %pM, channel %d, rssi %d, capa 0x04%x, mgmt_type %d, "
- "frame_len %d, SSID \"%s\"\n", &bi->BSSID, notif_bss_info->channel,
- notif_bss_info->rssi, mgmt->u.beacon.capab_info, mgmt_type,
- notif_bss_info->frame_len, bi->SSID));
signal = notif_bss_info->rssi * 100;
if (!mgmt->u.probe_resp.timestamp) {
isfree = true;
if (event == WLC_E_ASSOC_IND && reason == DOT11_SC_SUCCESS) {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, len, 0);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, len, 0, GFP_ATOMIC);
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) || \
defined(WL_COMPAT_WIRELESS)
cfg80211_rx_mgmt(ndev, freq, mgmt_frame, len, GFP_ATOMIC);
#endif /* LINUX_VERSION >= VERSION(3, 12, 0) */
} else if (event == WLC_E_DISASSOC_IND) {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, len, 0);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, len, 0, GFP_ATOMIC);
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) || \
defined(WL_COMPAT_WIRELESS)
cfg80211_rx_mgmt(ndev, freq, mgmt_frame, len, GFP_ATOMIC);
#endif /* LINUX_VERSION >= VERSION(3, 12, 0) */
} else if ((event == WLC_E_DEAUTH_IND) || (event == WLC_E_DEAUTH)) {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, len, 0);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, len, 0, GFP_ATOMIC);
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) || \
defined(WL_COMPAT_WIRELESS)
}
sinfo.assoc_req_ies = data;
sinfo.assoc_req_ies_len = len;
- printk("%s: connected device "MACDBG"\n", __FUNCTION__, MAC2STRDBG(e->addr.octet));
+ printf("%s: connected device "MACDBG"\n", __FUNCTION__, MAC2STRDBG(e->addr.octet));
cfg80211_new_sta(ndev, e->addr.octet, &sinfo, GFP_ATOMIC);
} else if (event == WLC_E_DISASSOC_IND) {
- printk("%s: disassociated device "MACDBG"\n", __FUNCTION__, MAC2STRDBG(e->addr.octet));
+ printf("%s: disassociated device "MACDBG"\n", __FUNCTION__, MAC2STRDBG(e->addr.octet));
cfg80211_del_sta(ndev, e->addr.octet, GFP_ATOMIC);
} else if ((event == WLC_E_DEAUTH_IND) || (event == WLC_E_DEAUTH)) {
- printk("%s: deauthenticated device "MACDBG"\n", __FUNCTION__, MAC2STRDBG(e->addr.octet));
+ printf("%s: deauthenticated device "MACDBG"\n", __FUNCTION__, MAC2STRDBG(e->addr.octet));
cfg80211_del_sta(ndev, e->addr.octet, GFP_ATOMIC);
}
#endif /* LINUX_VERSION < VERSION(3,2,0) && !WL_CFG80211_STA_EVENT && !WL_COMPAT_WIRELESS */
wl_link_up(cfg);
act = true;
if (!wl_get_drv_status(cfg, DISCONNECTING, ndev)) {
- printk("wl_bss_connect_done succeeded with " MACDBG "\n",
+ printf("wl_bss_connect_done succeeded with " MACDBG "\n",
MAC2STRDBG((u8*)(&e->addr)));
wl_bss_connect_done(cfg, ndev, e, data, true);
dhd_conf_set_phyoclscdenable((dhd_pub_t *)cfg->pub);
/* WLAN_REASON_UNSPECIFIED is used for hang up event in Android */
reason = (reason == WLAN_REASON_UNSPECIFIED)? 0 : reason;
- printk("link down if %s may call cfg80211_disconnected. "
+ printf("link down if %s may call cfg80211_disconnected. "
"event : %d, reason=%d from " MACDBG "\n",
ndev->name, event, ntoh32(e->reason),
MAC2STRDBG((u8*)(&e->addr)));
}
}
else if (wl_get_drv_status(cfg, CONNECTING, ndev)) {
- printk("link down, during connecting\n");
+ printf("link down, during connecting\n");
#ifdef ESCAN_RESULT_PATCH
if ((memcmp(connect_req_bssid, broad_bssid, ETHER_ADDR_LEN) == 0) ||
(memcmp(&e->addr, broad_bssid, ETHER_ADDR_LEN) == 0) ||
complete(&cfg->iface_disable);
} else if (wl_is_nonetwork(cfg, e)) {
- printk("connect failed event=%d e->status %d e->reason %d \n",
+ printf("connect failed event=%d e->status %d e->reason %d \n",
event, (int)ntoh32(e->status), (int)ntoh32(e->reason));
/* Clean up any pending scan request */
if (cfg->scan_request)
memcpy(cfg->fbt_key, data, FBT_KEYLEN);
}
#endif /* WLFBT */
- printk("wl_bss_roaming_done succeeded to " MACDBG "\n",
+ printf("wl_bss_roaming_done succeeded to " MACDBG "\n",
MAC2STRDBG((u8*)(&e->addr)));
dhd_conf_set_wme((dhd_pub_t *)cfg->pub);
WL_DBG((" device name is ndev %s \n", ndev->name));
#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ retval = cfg80211_rx_mgmt(cfgdev, freq, 0, mgmt_frame, mgmt_frame_len, 0);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
retval = cfg80211_rx_mgmt(cfgdev, freq, 0, mgmt_frame, mgmt_frame_len, 0, GFP_ATOMIC);
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) || \
defined(WL_COMPAT_WIRELESS)
static s32
wl_cfg80211_netdev_notifier_call(struct notifier_block * nb,
unsigned long state,
- void *ndev)
+ void *ptr)
{
- struct net_device *dev = ndev;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0))
+ struct net_device *dev = ptr;
+#else
+ // terence 20150701: fix for p2p connection issue
+ struct net_device *dev = netdev_notifier_info_to_dev(ptr);
+#endif
struct wireless_dev *wdev = dev->ieee80211_ptr;
struct bcm_cfg80211 *cfg = g_bcm_cfg;
case NETDEV_UNREGISTER:
/* after calling list_del_rcu(&wdev->list) */
- wl_dealloc_netinfo(cfg, ndev);
+ wl_dealloc_netinfo(cfg, dev);
break;
case NETDEV_GOING_DOWN:
/* At NETDEV_DOWN state, wdev_cleanup_work work will be called.
}
}
}
- printk("%s concurrency is enabled\n", cfg->vsdb_mode ? "Multi Channel" : "Same Channel");
+ printf("%s concurrency is enabled\n", cfg->vsdb_mode ? "Multi Channel" : "Same Channel");
return;
}
/* Update MAC addr for p2p0 interface here. */
memcpy(cfg->p2p_net->dev_addr, ndev->dev_addr, ETH_ALEN);
cfg->p2p_net->dev_addr[0] |= 0x02;
- printk("%s: p2p_dev_addr="MACDBG "\n",
+ printf("%s: p2p_dev_addr="MACDBG "\n",
cfg->p2p_net->name,
MAC2STRDBG(cfg->p2p_net->dev_addr));
} else {
cfg = (struct bcm_cfg80211 *)tsk->parent;
- printk("tsk Enter, tsk = 0x%p\n", tsk);
+ printf("tsk Enter, tsk = 0x%p\n", tsk);
while (down_interruptible (&tsk->sema) == 0) {
SMP_RD_BARRIER_DEPENDS();
}
DHD_OS_WAKE_UNLOCK(cfg->pub);
}
- printk("%s: was terminated\n", __FUNCTION__);
+ printf("%s: was terminated\n", __FUNCTION__);
complete_and_exit(&tsk->completed, 0);
return 0;
}
dhd_tdls_update_peer_info(ndev, TRUE, (uint8 *)&e->addr.octet[0]);
#endif /* PCIE_FULL_DONGLE */
if (cfg->tdls_mgmt_frame) {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+ cfg80211_rx_mgmt(cfgdev, cfg->tdls_mgmt_freq, 0,
+ cfg->tdls_mgmt_frame, cfg->tdls_mgmt_frame_len, 0);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
cfg80211_rx_mgmt(cfgdev, cfg->tdls_mgmt_freq, 0,
cfg->tdls_mgmt_frame, cfg->tdls_mgmt_frame_len,
0, GFP_ATOMIC);
void wl_cfg80211_enable_trace(u32 level)
{
wl_dbg_level = level;
- printk("%s: wl_dbg_level = 0x%x\n", __FUNCTION__, wl_dbg_level);
+ printf("%s: wl_dbg_level = 0x%x\n", __FUNCTION__, wl_dbg_level);
}
#if defined(WL_SUPPORT_BACKPORTED_KPATCHES) || (LINUX_VERSION_CODE >= KERNEL_VERSION(3, \
#if defined(WL_ENABLE_P2P_IF)
static int wl_cfgp2p_start_xmit(struct sk_buff *skb, struct net_device *ndev);
static int wl_cfgp2p_do_ioctl(struct net_device *net, struct ifreq *ifr, int cmd);
-static int wl_cfgp2p_if_open(struct net_device *net);
-static int wl_cfgp2p_if_stop(struct net_device *net);
+int wl_cfgp2p_if_open(struct net_device *net);
+int wl_cfgp2p_if_stop(struct net_device *net);
static const struct net_device_ops wl_cfgp2p_if_ops = {
.ndo_open = wl_cfgp2p_if_open,
CFGP2P_DBG((" enter\n"));
wl_clr_p2p_status(cfg, DISCOVERY_ON);
- if(!cfg->p2p) { // terence 20130113: Fix for p2p NULL pointer
+ if (!cfg->p2p) { // terence 20130113: Fix for p2p NULL pointer
ret = BCME_ERROR;
CFGP2P_ERR(("wl->p2p is NULL\n"));
goto exit;
#endif /* WL_NEWCFG_PRIVCMD_SUPPORT */
cfg->p2p_net = net;
- printk("%s: P2P Interface Registered\n", net->name);
+ printf("%s: P2P Interface Registered\n", net->name);
return ret;
}
#endif /* WL_ENABLE_P2P_IF || WL_NEWCFG_PRIVCMD_SUPPORT || defined(P2PONEINT) */
#if defined(WL_ENABLE_P2P_IF) || defined(P2PONEINT)
+int
#ifdef P2PONEINT
-int wl_cfgp2p_if_open(struct net_device *net)
+wl_cfgp2p_if_open(struct net_device *net)
#else
-static int wl_cfgp2p_if_open(struct net_device *net)
+wl_cfgp2p_if_open(struct net_device *net)
#endif
{
struct wireless_dev *wdev = net->ieee80211_ptr;
return 0;
}
+int
#ifdef P2PONEINT
-int wl_cfgp2p_if_stop(struct net_device *net)
+wl_cfgp2p_if_stop(struct net_device *net)
#else
-static int wl_cfgp2p_if_stop(struct net_device *net)
+wl_cfgp2p_if_stop(struct net_device *net)
#endif
{
struct wireless_dev *wdev = net->ieee80211_ptr;
cmd = SIOCGIWAP;
wrqu.data.length = strlen(extra);
if (!(flags & WLC_EVENT_MSG_LINK)) {
- printk("%s: Link Down with BSSID="MACSTR"\n", __FUNCTION__,
+ printf("%s: Link Down with BSSID="MACSTR"\n", __FUNCTION__,
MAC2STR((u8 *)wrqu.addr.sa_data));
bzero(wrqu.addr.sa_data, ETHER_ADDR_LEN);
bzero(&extra, ETHER_ADDR_LEN);
} else {
- printk("%s: Link UP with BSSID="MACSTR"\n", __FUNCTION__,
+ printf("%s: Link UP with BSSID="MACSTR"\n", __FUNCTION__,
MAC2STR((u8 *)wrqu.addr.sa_data));
}
break;
uint32 status;
iscan_info_t *iscan = (iscan_info_t *)data;
- printk("%s: thread Enter\n", __FUNCTION__);
+ printf("%s: thread Enter\n", __FUNCTION__);
DAEMONIZE("iscan_sysioc");
status = WL_SCAN_RESULTS_PARTIAL;
break;
}
}
- printk("%s: was terminated\n", __FUNCTION__);
+ printf("%s: was terminated\n", __FUNCTION__);
complete_and_exit(&iscan->sysioc_exited, 0);
}
{
iscan_info_t *iscan = NULL;
- printk("%s: Enter\n", __FUNCTION__);
+ printf("%s: Enter\n", __FUNCTION__);
if (!dev)
return 0;
projects / firefly-linux-kernel-4.4.55.git / commitdiff