Fix use-after-free in wifi_cleanup() am: 2ce1c4952d
am: 075a2c5085
* commit '075a2c508582773018e098d653a98b3004764922':
Fix use-after-free in wifi_cleanup()
diff --git a/bcmdhd/firmware/bcm4343/device-bcm.mk b/bcmdhd/firmware/bcm4343/device-bcm.mk
index f3cf3e3..2bacea8 100644
--- a/bcmdhd/firmware/bcm4343/device-bcm.mk
+++ b/bcmdhd/firmware/bcm4343/device-bcm.mk
@@ -17,6 +17,19 @@
BCM_FW_SRC_FILE_STA := fw_bcm4343.bin
BCM_FW_SRC_FILE_AP := fw_bcm4343_apsta.bin
+ifneq (,$(WIFI_FW_VER))
+ifneq (,$(filter a0, $(WIFI_FW_VER)))
PRODUCT_COPY_FILES += \
- hardware/broadcom/wlan/bcmdhd/firmware/bcm4343/$(BCM_FW_SRC_FILE_STA):system/vendor/firmware/fw_bcmdhd.bin \
- hardware/broadcom/wlan/bcmdhd/firmware/bcm4343/$(BCM_FW_SRC_FILE_AP):system/vendor/firmware/fw_bcmdhd_apsta.bin
+ hardware/broadcom/wlan/bcmdhd/firmware/bcm4343/$(BCM_FW_SRC_FILE_STA):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd.bin \
+ hardware/broadcom/wlan/bcmdhd/firmware/bcm4343/$(BCM_FW_SRC_FILE_AP):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_apsta.bin
+endif
+ifneq (,$(filter a1, $(WIFI_FW_VER)))
+PRODUCT_COPY_FILES += \
+ hardware/broadcom/wlan/bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd.bin_a1 \
+ hardware/broadcom/wlan/bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_apsta.bin_a1
+endif
+else
+PRODUCT_COPY_FILES += \
+ hardware/broadcom/wlan/bcmdhd/firmware/bcm4343/$(BCM_FW_SRC_FILE_STA):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd.bin \
+ hardware/broadcom/wlan/bcmdhd/firmware/bcm4343/$(BCM_FW_SRC_FILE_AP):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_apsta.bin
+endif
diff --git a/bcmdhd/firmware/bcm4343/fw_bcm4343.bin b/bcmdhd/firmware/bcm4343/fw_bcm4343.bin
index c6e8174..949d379 100644
--- a/bcmdhd/firmware/bcm4343/fw_bcm4343.bin
+++ b/bcmdhd/firmware/bcm4343/fw_bcm4343.bin
Binary files differ
diff --git a/bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin b/bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin
new file mode 100644
index 0000000..efa0ea6
--- /dev/null
+++ b/bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin
Binary files differ
diff --git a/bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin b/bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin
new file mode 100644
index 0000000..0ea4a9a
--- /dev/null
+++ b/bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin
Binary files differ
diff --git a/bcmdhd/firmware/bcm4343/fw_bcm4343_apsta.bin b/bcmdhd/firmware/bcm4343/fw_bcm4343_apsta.bin
index a23e5f5..904cc3d 100644
--- a/bcmdhd/firmware/bcm4343/fw_bcm4343_apsta.bin
+++ b/bcmdhd/firmware/bcm4343/fw_bcm4343_apsta.bin
Binary files differ
