diff mbox series

[06/12] ctrl: use IFNAME for global iface

Message ID 20200112220226.5056-6-janusz.dziedzic@gmail.com
State Accepted
Headers show
Series [01/12] tests: remote: switch to python3 | expand

Commit Message

Janusz Dziedzic Jan. 12, 2020, 10:02 p.m. UTC 
Seems for some reason for UDP case
we send IFACE instead of IFNAME.

This fix problem when at least one
test case fail (hapd_ctrl_sta) when
remote/udp used.

This also fix test_connectivity.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@gmail.com>
---
 hostapd/ctrl_iface.c            | 5 -----
 wpa_supplicant/ctrl_iface_udp.c | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index 9758881bb..0ef38e9f7 100644
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -4616,13 +4616,8 @@  static void hostapd_ctrl_iface_send_internal(int sock, struct dl_list *ctrl_dst,
 		return;
 	idx = 0;
 	if (ifname) {
-#ifdef CONFIG_CTRL_IFACE_UDP
-		io[idx].iov_base = "IFACE=";
-		io[idx].iov_len = 6;
-#else /* CONFIG_CTRL_IFACE_UDP */
 		io[idx].iov_base = "IFNAME=";
 		io[idx].iov_len = 7;
-#endif /* CONFIG_CTRL_IFACE_UDP */
 		idx++;
 		io[idx].iov_base = (char *) ifname;
 		io[idx].iov_len = os_strlen(ifname);
diff --git a/wpa_supplicant/ctrl_iface_udp.c b/wpa_supplicant/ctrl_iface_udp.c
index 8a6057a82..1e92b9752 100644
--- a/wpa_supplicant/ctrl_iface_udp.c
+++ b/wpa_supplicant/ctrl_iface_udp.c
@@ -516,7 +516,7 @@  static void wpa_supplicant_ctrl_iface_send(struct wpa_supplicant *wpa_s,
 		return;
 
 	if (ifname)
-		os_snprintf(levelstr, sizeof(levelstr), "IFACE=%s <%d>",
+		os_snprintf(levelstr, sizeof(levelstr), "IFNAME=%s <%d>",
 			    ifname, level);
 	else
 		os_snprintf(levelstr, sizeof(levelstr), "<%d>", level);