commit 655c90407344a0e1d69e6b27e6d16876d5818d25
author Bill Rassieur <rassb@google.com> Wed Apr 03 21:57:01 2019 +0000
committer Bill Rassieur <rassb@google.com> Wed Apr 03 21:57:01 2019 +0000
tree 160446d273549cc5ee04e2ead3e8175ae8685512
parent d817dabdeb263898703923e8b0b8523505847919
parent 52ef3da2b0b53690d60d9370c0fe47d8cbf3fd7c

Merge master@5433138 into git_qt-dev-plus-aosp.

Change-Id: I2d7aaadc43b88671b63f2b09b5276bf67ea13b5a
BUG: 129345239

wifi/wifi_hal/wifi_offload.cpp

diff --git a/wifi/wifi_hal/wifi_offload.cpp b/wifi/wifi_hal/wifi_offload.cpp
index 9ef1912..99c2fec 100644
--- a/wifi/wifi_hal/wifi_offload.cpp
+++ b/wifi/wifi_hal/wifi_offload.cpp
@@ -216,7 +216,8 @@
 
 /* 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)