summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorAhmed ElArabawy <arabawy@google.com>2019-03-05 17:38:06 -0800
committerAhmed ElArabawy <arabawy@google.com>2019-03-18 16:06:12 -0700
commitffbad18ca07482b826d69f6142982cc6a93a2137 (patch)
treebf4021b4bdad2b1a1871417b65292ab477bee2d6 /wifi
parent9cc43c58a4e764ec0ae03a904703292b8199314e (diff)
downloadandroid_hardware_interfaces-ffbad18ca07482b826d69f6142982cc6a93a2137.tar.gz
android_hardware_interfaces-ffbad18ca07482b826d69f6142982cc6a93a2137.tar.bz2
android_hardware_interfaces-ffbad18ca07482b826d69f6142982cc6a93a2137.zip
Wifi: Add ether_type to sending offloaded packet
This commit adds the ether_type as an argument to the legacy hal function to send an offloaded packet. Bug: 122487582 Test: Manual Test: Make sure ether_type is passed all the way to vendor hal function Change-Id: I5918088000cc455e7f83feddc1090803ccc04c06
Diffstat (limited to 'wifi')
-rw-r--r--wifi/1.3/default/wifi_legacy_hal.cpp8
-rw-r--r--wifi/1.3/default/wifi_legacy_hal.h2
-rw-r--r--wifi/1.3/default/wifi_sta_iface.cpp6
3 files changed, 8 insertions, 8 deletions
diff --git a/wifi/1.3/default/wifi_legacy_hal.cpp b/wifi/1.3/default/wifi_legacy_hal.cpp
index 5aa98c416..7f9b63575 100644
--- a/wifi/1.3/default/wifi_legacy_hal.cpp
+++ b/wifi/1.3/default/wifi_legacy_hal.cpp
@@ -777,7 +777,7 @@ wifi_error WifiLegacyHal::configureNdOffload(const std::string& iface_name,
}
wifi_error WifiLegacyHal::startSendingOffloadedPacket(
- const std::string& iface_name, uint32_t cmd_id,
+ const std::string& iface_name, uint32_t cmd_id, uint16_t ether_type,
const std::vector<uint8_t>& ip_packet_data,
const std::array<uint8_t, 6>& src_address,
const std::array<uint8_t, 6>& dst_address, uint32_t period_in_ms) {
@@ -787,9 +787,9 @@ wifi_error WifiLegacyHal::startSendingOffloadedPacket(
std::vector<uint8_t> dst_address_internal(
dst_address.data(), dst_address.data() + dst_address.size());
return global_func_table_.wifi_start_sending_offloaded_packet(
- cmd_id, getIfaceHandle(iface_name), ip_packet_data_internal.data(),
- ip_packet_data_internal.size(), src_address_internal.data(),
- dst_address_internal.data(), period_in_ms);
+ cmd_id, getIfaceHandle(iface_name), ether_type,
+ ip_packet_data_internal.data(), ip_packet_data_internal.size(),
+ src_address_internal.data(), dst_address_internal.data(), period_in_ms);
}
wifi_error WifiLegacyHal::stopSendingOffloadedPacket(
diff --git a/wifi/1.3/default/wifi_legacy_hal.h b/wifi/1.3/default/wifi_legacy_hal.h
index 70a919f8c..558103c61 100644
--- a/wifi/1.3/default/wifi_legacy_hal.h
+++ b/wifi/1.3/default/wifi_legacy_hal.h
@@ -246,7 +246,7 @@ class WifiLegacyHal {
fw_roaming_state_t state);
wifi_error configureNdOffload(const std::string& iface_name, bool enable);
wifi_error startSendingOffloadedPacket(
- const std::string& iface_name, uint32_t cmd_id,
+ const std::string& iface_name, uint32_t cmd_id, uint16_t ether_type,
const std::vector<uint8_t>& ip_packet_data,
const std::array<uint8_t, 6>& src_address,
const std::array<uint8_t, 6>& dst_address, uint32_t period_in_ms);
diff --git a/wifi/1.3/default/wifi_sta_iface.cpp b/wifi/1.3/default/wifi_sta_iface.cpp
index 17f3e3d9d..a6539e5d9 100644
--- a/wifi/1.3/default/wifi_sta_iface.cpp
+++ b/wifi/1.3/default/wifi_sta_iface.cpp
@@ -562,12 +562,12 @@ WifiStatus WifiStaIface::enableNdOffloadInternal(bool enable) {
WifiStatus WifiStaIface::startSendingKeepAlivePacketsInternal(
uint32_t cmd_id, const std::vector<uint8_t>& ip_packet_data,
- uint16_t /* ether_type */, const std::array<uint8_t, 6>& src_address,
+ uint16_t ether_type, const std::array<uint8_t, 6>& src_address,
const std::array<uint8_t, 6>& dst_address, uint32_t period_in_ms) {
legacy_hal::wifi_error legacy_status =
legacy_hal_.lock()->startSendingOffloadedPacket(
- ifname_, cmd_id, ip_packet_data, src_address, dst_address,
- period_in_ms);
+ ifname_, cmd_id, ether_type, ip_packet_data, src_address,
+ dst_address, period_in_ms);
return createWifiStatusFromLegacyError(legacy_status);
}