Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccf9cbea authored by Ahmed ElArabawy's avatar Ahmed ElArabawy Committed by Android (Google) Code Review
Browse files

Merge "Wifi: Add ether_type to sending offloaded packet"

parents 019d89b7 ffbad18c

wifi/1.3/default/wifi_legacy_hal.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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(

wifi/1.3/default/wifi_legacy_hal.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

wifi/1.3/default/wifi_sta_iface.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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);

}