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

Commit 612d3dbf authored by Roshan Pius's avatar Roshan Pius Committed by android-build-merger
Browse files

Merge "wifi(implementation): Turn on DFS flag for STA" into oc-dev 

am: b09f65c4

Change-Id: Iadceaaca523f9dc115fbbfc25f7dd169b11edc8a
parents 41ae5faa b09f65c4

wifi/1.0/default/wifi_legacy_hal.cpp

+5 −0
Original line number Diff line number Diff line
@@ -587,6 +587,11 @@ WifiLegacyHal::getValidFrequenciesForBand(wifi_band band) { 
  return {status, std::move(freqs)};

}



wifi_error WifiLegacyHal::setDfsFlag(bool dfs_on) {

  return global_func_table_.wifi_set_nodfs_flag(

      wlan_interface_handle_, dfs_on ? 0 : 1);

}



wifi_error WifiLegacyHal::enableLinkLayerStats(bool debug) {

  wifi_link_layer_params params;

  params.mpdu_size_threshold = kLinkLayerStatsDataMpduSizeThreshold;

wifi/1.0/default/wifi_legacy_hal.h

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ class WifiLegacyHal { 
  wifi_error stopGscan(wifi_request_id id);

  std::pair<wifi_error, std::vector<uint32_t>> getValidFrequenciesForBand(

      wifi_band band);

  wifi_error setDfsFlag(bool dfs_on);

  // Link layer stats functions.

  wifi_error enableLinkLayerStats(bool debug);

  wifi_error disableLinkLayerStats();

wifi/1.0/default/wifi_sta_iface.cpp

+8 −1
Original line number Diff line number Diff line
@@ -31,7 +31,14 @@ using hidl_return_util::validateAndCall; 
WifiStaIface::WifiStaIface(

    const std::string& ifname,

    const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)

    : ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {}

    : ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {

  // Turn on DFS channel usage for STA iface.

  legacy_hal::wifi_error legacy_status =

      legacy_hal_.lock()->setDfsFlag(true);

  if (legacy_status != legacy_hal::WIFI_SUCCESS) {

    LOG(ERROR) << "Failed to set DFS flag; DFS channels may be unavailable.";

  }

}



void WifiStaIface::invalidate() {

  legacy_hal_.reset();