Remove wifi_(host|guest)_mac_addr.
This is not used with the new wifi implementation.
Test: Build and run, TreeHugger
Change-Id: I35d4dccbb857bc1ace6f118a3a3f564e26236021
diff --git a/host/commands/launch/flags.cc b/host/commands/launch/flags.cc
index 4ccafdc..5ec89a3 100644
--- a/host/commands/launch/flags.cc
+++ b/host/commands/launch/flags.cc
@@ -152,12 +152,6 @@
"Location of the adb_connector binary. Only relevant if "
"-run_adb_connector is true");
DEFINE_int32(vhci_port, GetPerInstanceDefault(0), "VHCI port to use for usb");
-DEFINE_string(guest_mac_address,
- GetPerInstanceDefault("00:43:56:44:80:"), // 00:43:56:44:80:0x
- "MAC address of the wifi interface to be created on the guest.");
-DEFINE_string(host_mac_address,
- "42:00:00:00:00:00",
- "MAC address of the wifi interface running on the host.");
DEFINE_string(wifi_tap_name, "", // default handled on ParseCommandLine
"The name of the tap interface to use for wifi");
DEFINE_int32(vsock_guest_cid,
@@ -484,9 +478,6 @@
tmp_config_obj.set_wifi_tap_name(FLAGS_wifi_tap_name);
- tmp_config_obj.set_wifi_guest_mac_addr(FLAGS_guest_mac_address);
- tmp_config_obj.set_wifi_host_mac_addr(FLAGS_host_mac_address);
-
tmp_config_obj.set_vsock_guest_cid(FLAGS_vsock_guest_cid);
tmp_config_obj.set_uuid(FLAGS_uuid);
diff --git a/host/libs/config/cuttlefish_config.cpp b/host/libs/config/cuttlefish_config.cpp
index 3ee56d9..fffccf9 100644
--- a/host/libs/config/cuttlefish_config.cpp
+++ b/host/libs/config/cuttlefish_config.cpp
@@ -112,8 +112,6 @@
const char* kMobileBridgeName = "mobile_bridge_name";
const char* kMobileTapName = "mobile_tap_name";
const char* kWifiTapName = "wifi_tap_name";
-const char* kWifiGuestMacAddr = "wifi_guest_mac_addr";
-const char* kWifiHostMacAddr = "wifi_host_mac_addr";
const char* kVsockGuestCid = "vsock_guest_cid";
const char* kUuid = "uuid";
@@ -495,22 +493,6 @@
(*dictionary_)[kMobileBridgeName] = mobile_bridge_name;
}
-std::string CuttlefishConfig::wifi_guest_mac_addr() const {
- return (*dictionary_)[kWifiGuestMacAddr].asString();
-}
-void CuttlefishConfig::set_wifi_guest_mac_addr(
- const std::string& wifi_guest_mac_addr) {
- (*dictionary_)[kWifiGuestMacAddr] = wifi_guest_mac_addr;
-}
-
-std::string CuttlefishConfig::wifi_host_mac_addr() const {
- return (*dictionary_)[kWifiHostMacAddr].asString();
-}
-void CuttlefishConfig::set_wifi_host_mac_addr(
- const std::string& wifi_host_mac_addr) {
- (*dictionary_)[kWifiHostMacAddr] = wifi_host_mac_addr;
-}
-
std::string CuttlefishConfig::mobile_tap_name() const {
return (*dictionary_)[kMobileTapName].asString();
}
diff --git a/host/libs/config/cuttlefish_config.h b/host/libs/config/cuttlefish_config.h
index 19be675..c15a3e6 100644
--- a/host/libs/config/cuttlefish_config.h
+++ b/host/libs/config/cuttlefish_config.h
@@ -206,12 +206,6 @@
std::string wifi_tap_name() const;
void set_wifi_tap_name(const std::string& wifi_tap_name);
- std::string wifi_guest_mac_addr() const;
- void set_wifi_guest_mac_addr(const std::string& wifi_guest_mac_addr);
-
- std::string wifi_host_mac_addr() const;
- void set_wifi_host_mac_addr(const std::string& wifi_host_mac_addr);
-
void set_vsock_guest_cid(int vsock_guest_cid);
int vsock_guest_cid() const;
