diff options
| author | Xin Li <delphij@google.com> | 2019-09-05 16:53:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-05 16:53:19 +0000 |
| commit | 1d6092608126645f889109c736a168a3f58bf68f (patch) | |
| tree | e83a6bbe988bc6f6d6c0ca1003d760505670084b | |
| parent | ffc847abb0116368fa1ff76510ecf622b8812618 (diff) | |
| parent | b24826c6e5bc22ce0c2f5d35407f20d02165de8b (diff) | |
| download | platform_hardware_broadcom_wlan-1d6092608126645f889109c736a168a3f58bf68f.tar.gz platform_hardware_broadcom_wlan-1d6092608126645f889109c736a168a3f58bf68f.tar.bz2 platform_hardware_broadcom_wlan-1d6092608126645f889109c736a168a3f58bf68f.zip | |
Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21
| -rw-r--r-- | bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin | bin | 326978 -> 326982 bytes | |||
| -rw-r--r-- | bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin | bin | 298555 -> 298559 bytes | |||
| -rw-r--r-- | bcmdhd/firmware/bcm4375/device-bcm.mk | 6 | ||||
| -rwxr-xr-x | bcmdhd/firmware/bcm4375/fw_bcm4375_b1.bin | bin | 0 -> 1180313 bytes | |||
| -rwxr-xr-x | bcmdhd/firmware/bcm4375/fw_bcm4375_b1_ap.bin | bin | 0 -> 1180313 bytes | |||
| -rw-r--r-- | bcmdhd/wifi_hal/wifi_offload.cpp | 3 |
6 files changed, 7 insertions, 2 deletions
diff --git a/bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin b/bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin Binary files differindex 5755dfc..19513e5 100644 --- a/bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin +++ 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 differindex df7fe71..58f4336 100644 --- a/bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin +++ b/bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin diff --git a/bcmdhd/firmware/bcm4375/device-bcm.mk b/bcmdhd/firmware/bcm4375/device-bcm.mk index 709f3aa..bca8e4f 100644 --- a/bcmdhd/firmware/bcm4375/device-bcm.mk +++ b/bcmdhd/firmware/bcm4375/device-bcm.mk @@ -19,8 +19,12 @@ BCM_FW_SRC_FILE_STA := fw_bcm4375.bin BCM_FW_SRC_FILE_AP := fw_bcm4375_ap.bin +BCM_FW_SRC_FILE_STA_B1 := fw_bcm4375_b1.bin +BCM_FW_SRC_FILE_AP_B1 := fw_bcm4375_b1_ap.bin PRODUCT_COPY_FILES += \ hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/$(BCM_FW_SRC_FILE_STA):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd.bin \ - hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/$(BCM_FW_SRC_FILE_AP):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_apsta.bin + hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/$(BCM_FW_SRC_FILE_AP):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_apsta.bin \ + hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/$(BCM_FW_SRC_FILE_STA_B1):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_b1.bin \ + hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/$(BCM_FW_SRC_FILE_AP_B1):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_apsta_b1.bin ######################## diff --git a/bcmdhd/firmware/bcm4375/fw_bcm4375_b1.bin b/bcmdhd/firmware/bcm4375/fw_bcm4375_b1.bin Binary files differnew file mode 100755 index 0000000..dccc247 --- /dev/null +++ b/bcmdhd/firmware/bcm4375/fw_bcm4375_b1.bin diff --git a/bcmdhd/firmware/bcm4375/fw_bcm4375_b1_ap.bin b/bcmdhd/firmware/bcm4375/fw_bcm4375_b1_ap.bin Binary files differnew file mode 100755 index 0000000..dccc247 --- /dev/null +++ b/bcmdhd/firmware/bcm4375/fw_bcm4375_b1_ap.bin diff --git a/bcmdhd/wifi_hal/wifi_offload.cpp b/bcmdhd/wifi_hal/wifi_offload.cpp index 9ef1912..99c2fec 100644 --- a/bcmdhd/wifi_hal/wifi_offload.cpp +++ b/bcmdhd/wifi_hal/wifi_offload.cpp @@ -216,7 +216,8 @@ public: /* API to send specified mkeep_alive packet periodically. */ wifi_error wifi_start_sending_offloaded_packet(wifi_request_id index, wifi_interface_handle iface, - u8 *ip_packet, u16 ip_packet_len, u8 *src_mac_addr, u8 *dst_mac_addr, u32 period_msec) + u16 /* ether_type */, u8 *ip_packet, u16 ip_packet_len, u8 *src_mac_addr, u8 *dst_mac_addr, + u32 period_msec) { if ((index > 0 && index <= N_AVAIL_ID) && (ip_packet != NULL) && (src_mac_addr != NULL) && (dst_mac_addr != NULL) && (period_msec > 0) |