Merge "wificond: Update BandWiphyIndexMap when country code changed" into tm-dev

1 files changed, 6 insertions, 1 deletions

diff --git a/server.cpp b/server.cpp
index e47c98b..1c40185 100644
--- a/server.cpp
+++ b/server.cpp
@@ -495,7 +495,12 @@ void Server::OnRegDomainChanged(uint32_t wiphy_index, std::string& country_code)
               << " on wiphy_index: " << wiphy_index;
     BroadcastRegDomainChanged(country_code);
   }
-  UpdateBandWiphyIndexMap(wiphy_index);
+  // Sometimes lower layer sends stale wiphy index when there are no
+  // interfaces. So update band - wiphy index mapping only if an
+  // interface exists
+  if (!hasNoIfaceForWiphyIndex(wiphy_index)) {
+    UpdateBandWiphyIndexMap(wiphy_index);
+  }
   LogSupportedBands(wiphy_index);
 }