bcmdhd wifi:update driver 1.201.59.5

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / rockchip_wlan / rkwifi / bcmdhd / dhd_linux.c

diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_linux.c
index ed276a73bc849063fd810cacbc43dd400b81dd6a..bc5f017d05283366cea3ea5b64da9eb23767204f 100755 (executable)
--- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_linux.c
+++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_linux.c
@@ -4223,7 +4223,7 @@ dhd_stop(struct net_device *net)
        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;
        }
@@ -4286,7 +4286,7 @@ 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;
@@ -4332,7 +4332,7 @@ dhd_open(struct net_device *net)
        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) {
@@ -4453,7 +4453,7 @@ exit:
 #endif
 #endif /* MULTIPLE_SUPPLICANT */
 
-       printk("%s: Exit ret=%d\n", __FUNCTION__, ret);
+       printf("%s: Exit ret=%d\n", __FUNCTION__, ret);
        return ret;
 }
 
@@ -6099,6 +6099,8 @@ dhd_preinit_ioctls(dhd_pub_t *dhd)
        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) ||
@@ -6119,7 +6121,8 @@ dhd_preinit_ioctls(dhd_pub_t *dhd)
                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;
                }
@@ -6595,7 +6598,7 @@ dhd_preinit_ioctls(dhd_pub_t *dhd)
        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 */
@@ -7600,14 +7603,14 @@ dhd_clear(dhd_pub_t *dhdp)
 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 
@@ -7623,7 +7626,7 @@ dhd_module_init(void)
        int err;
        int retry = POWERUP_MAX_RETRY;
 
-       printk("%s: in\n", __FUNCTION__);
+       printf("%s: in\n", __FUNCTION__);
 
        DHD_PERIM_RADIO_INIT();
 
@@ -7656,7 +7659,7 @@ dhd_module_init(void)
        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;
 }
 
@@ -7689,16 +7692,16 @@ int rockchip_wifi_init_module_rkwifi(void)
     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
@@ -7712,9 +7715,9 @@ void rockchip_wifi_exit_module_rkwifi(void)
     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();
 }