net: wireless: bcmdhd: Update to 5.90.125.64:

[android-x86/kernel.git] / drivers / net / wireless / bcmdhd / dhd_cdc.c

diff --git a/drivers/net/wireless/bcmdhd/dhd_cdc.c b/drivers/net/wireless/bcmdhd/dhd_cdc.c
index 91c461f..fde8a35 100644 (file)
--- a/drivers/net/wireless/bcmdhd/dhd_cdc.c
+++ b/drivers/net/wireless/bcmdhd/dhd_cdc.c
@@ -1920,7 +1920,6 @@ dhd_wlfc_init(dhd_pub_t *dhd)
                WLFC_FLAGS_CREDIT_STATUS_SIGNALS |
                WLFC_FLAGS_HOST_PROPTXSTATUS_ACTIVE : 0;
 
-       dhd->wlfc_state  = NULL;
 
        /*
        try to enable/disable signaling by sending "tlv" iovar. if that fails,
@@ -2297,16 +2296,15 @@ dhd_prot_init(dhd_pub_t *dhd)
                goto done;
 
 
+#ifdef PROP_TXSTATUS
+       ret = dhd_wlfc_init(dhd);
+#endif
+
        ret = dhd_preinit_ioctls(dhd);
 
        /* Always assumes wl for now */
        dhd->iswl = TRUE;
 
-#ifdef PROP_TXSTATUS
-       ret = dhd_wlfc_init(dhd);
-#endif
-       goto done;
-
 done:
        return ret;
 }