ctrl_iface: Retain legacy ctrl interface directory
The ctrl_interface format as ctrl_<ifname> seems not necessary.
For bridged SAP case, the interface name is different already.
For Multi-Link SAP case, upstream hostapd already implemented
link level socket with commit
14cb3906af0a53547019d3b2c68fc4f2fca41f5a. Also, this
ctrl_<ifname> format causes unexpected failure when using
"hostapd_cli" without any parameter in legacy cases.
Retain legacy ctrl interface to fix that.
Bug: 395521142
Test: Manual test, single band & dual band hotspot works normally.
Change-Id: I840c03aa0a171b155c1d0f60b5ca25431de2d9e7
diff --git a/hostapd/aidl/hostapd.cpp b/hostapd/aidl/hostapd.cpp
index 412919c..06bc90d 100644
--- a/hostapd/aidl/hostapd.cpp
+++ b/hostapd/aidl/hostapd.cpp
@@ -881,7 +881,7 @@
"%s\n"
"interface=%s\n"
"driver=nl80211\n"
- "ctrl_interface=/data/vendor/wifi/hostapd/ctrl_%s\n"
+ "ctrl_interface=/data/vendor/wifi/hostapd/ctrl\n"
// ssid2 signals to hostapd that the value is not a literal value
// for use as a SSID. In this case, we're giving it a hex
// std::string and hostapd needs to expect that.
@@ -907,7 +907,6 @@
"%s\n",
sanitized_overlay.c_str(),
iface_params.usesMlo ? br_name.c_str() : iface_params.name.c_str(),
- iface_params.name.c_str(),
ssid_as_string.c_str(),
channel_config_as_string.c_str(),
iface_params.hwModeParams.enable80211N ? 1 : 0,