commit 93f5c6d3bf784a5afb0ac5b2d7f7165e326f580b
author William A. Kennington III <wak@google.com> Thu Nov 17 16:23:44 2022 -0800
committer William A. Kennington III <wak@google.com> Mon Nov 21 03:00:08 2022 -0800
tree 4e9b8ab9d4b7e488838fc26bba75778e3ea8f24f
parent 876927cb0a1a217a74c0cf45a162f7abe2a16617

ethernet_interface: Fix VLAN delete

This ensures that we delete the interface in the correct order with
reloads.

Change-Id: I6fec890b112b62be15256af415a6df1bfb6ccd38
Signed-off-by: William A. Kennington III <wak@google.com>

src/network_manager.hpp

diff --git a/src/network_manager.hpp b/src/network_manager.hpp
index 146da33..27ac8ae 100644
--- a/src/network_manager.hpp
+++ b/src/network_manager.hpp
@@ -117,6 +117,7 @@
      */
     string_umap<std::unique_ptr<EthernetInterface>> interfaces;
     std::unordered_map<unsigned, EthernetInterface*> interfacesByIdx;
+    std::unordered_set<unsigned> ignoredIntf;
 
     /** @brief Adds a hook that runs immediately prior to reloading
      *
@@ -152,7 +153,6 @@
 
     /** @brief Map of interface info for undiscovered interfaces */
     std::unordered_map<unsigned, AllIntfInfo> intfInfo;
-    std::unordered_set<unsigned> ignoredIntf;
 
     /** @brief Map of enabled interfaces */
     std::unordered_map<unsigned, bool> systemdNetworkdEnabled;