diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:19:50 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:19:50 -0800 |
| commit | 6636331092e620d0dba650d04bf19cedeb021785 (patch) | |
| tree | 2daf13f10c70dc7413deeff50a2cb2c3a3d3d8e2 | |
| parent | 33a76ddde2c0049b97e69df059adda30704be4c5 (diff) | |
| parent | 3a30c034a9f319692c2ba131906e009eaa254817 (diff) | |
| download | hardware_broadcom_wlan-6636331092e620d0dba650d04bf19cedeb021785.zip hardware_broadcom_wlan-6636331092e620d0dba650d04bf19cedeb021785.tar.gz hardware_broadcom_wlan-6636331092e620d0dba650d04bf19cedeb021785.tar.bz2 | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/hardware/broadcom/wlan into cm-13.0
Android 6.0.1 release 22
| -rw-r--r-- | bcmdhd/firmware/bcm4343/device-bcm.mk | 17 | ||||
| -rw-r--r-- | bcmdhd/firmware/bcm4343/fw_bcm4343.bin | bin | 342252 -> 342292 bytes | |||
| -rw-r--r-- | bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin | bin | 0 -> 325341 bytes | |||
| -rw-r--r-- | bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin | bin | 0 -> 297097 bytes | |||
| -rw-r--r-- | bcmdhd/firmware/bcm4343/fw_bcm4343_apsta.bin | bin | 313848 -> 313852 bytes | |||
| -rw-r--r-- | bcmdhd/wifi_hal/cpp_bindings.cpp | 3 |
6 files changed, 18 insertions, 2 deletions
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 Binary files differindex c6e8174..949d379 100644 --- a/bcmdhd/firmware/bcm4343/fw_bcm4343.bin +++ b/bcmdhd/firmware/bcm4343/fw_bcm4343.bin diff --git a/bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin b/bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin Binary files differnew file mode 100644 index 0000000..efa0ea6 --- /dev/null +++ b/bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin diff --git a/bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin b/bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin Binary files differnew file mode 100644 index 0000000..0ea4a9a --- /dev/null +++ b/bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin diff --git a/bcmdhd/firmware/bcm4343/fw_bcm4343_apsta.bin b/bcmdhd/firmware/bcm4343/fw_bcm4343_apsta.bin Binary files differindex a23e5f5..904cc3d 100644 --- a/bcmdhd/firmware/bcm4343/fw_bcm4343_apsta.bin +++ b/bcmdhd/firmware/bcm4343/fw_bcm4343_apsta.bin diff --git a/bcmdhd/wifi_hal/cpp_bindings.cpp b/bcmdhd/wifi_hal/cpp_bindings.cpp index 5b085d8..399199d 100644 --- a/bcmdhd/wifi_hal/cpp_bindings.cpp +++ b/bcmdhd/wifi_hal/cpp_bindings.cpp @@ -538,6 +538,9 @@ int WifiEvent::parse() { } int WifiRequest::create(int family, uint8_t cmd, int flags, int hdrlen) { + + destroy(); + mMsg = nlmsg_alloc(); if (mMsg != NULL) { genlmsg_put(mMsg, /* pid = */ 0, /* seq = */ 0, family, |