X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/de1bb6ef97ddd71db237578bd5f7ed8c5a61fb82..3a1a68de7495b2addfe13cbcbcc842dc0b935cfa:/package/iwinfo/src/iwinfo_nl80211.c?ds=sidebyside

diff --git a/package/iwinfo/src/iwinfo_nl80211.c b/package/iwinfo/src/iwinfo_nl80211.c
index 4b8b37daa..e8cfb902f 100644
--- a/package/iwinfo/src/iwinfo_nl80211.c
+++ b/package/iwinfo/src/iwinfo_nl80211.c
@@ -387,10 +387,13 @@ static char * nl80211_wpactl_info(const char *ifname, const char *cmd,
 		goto out;
 
 
-	send(sock, "ATTACH", 6, 0);
+	if (event)
+	{
+		send(sock, "ATTACH", 6, 0);
 
-	if (nl80211_wpactl_recv(sock, buffer, sizeof(buffer)) <= 0)
-		goto out;
+		if (nl80211_wpactl_recv(sock, buffer, sizeof(buffer)) <= 0)
+			goto out;
+	}
 
 
 	send(sock, cmd, strlen(cmd), 0);
@@ -405,7 +408,7 @@ static char * nl80211_wpactl_info(const char *ifname, const char *cmd,
 			break;
 		}
 
-		if ((!event && buffer[0] != '<') || strstr(buffer, event))
+		if ((!event && buffer[0] != '<') || (event && strstr(buffer, event)))
 			break;
 	}
 
@@ -559,6 +562,9 @@ void nl80211_close(void)
 {
 	if (nls)
 	{
+		if (nls->nl80211)
+			genl_family_put(nls->nl80211);
+
 		if (nls->nl_sock)
 			nl_socket_free(nls->nl_sock);
 
@@ -1631,6 +1637,27 @@ int nl80211_get_mbssid_support(const char *ifname, int *buf)
 
 int nl80211_get_hardware_id(const char *ifname, char *buf)
 {
+	int rv;
+	char *res;
+
+	/* Got a radioX pseudo interface, find some interface on it or create one */
+	if (!strncmp(ifname, "radio", 5))
+	{
+		/* Reuse existing interface */
+		if ((res = nl80211_phy2ifname(ifname)) != NULL)
+		{
+			return wext_get_hardware_id(res, buf);
+		}
+
+		/* Need to spawn a temporary iface for finding IDs */
+		else if ((res = nl80211_ifadd(ifname)) != NULL)
+		{
+			rv = wext_get_hardware_id(res, buf);
+			nl80211_ifdel(res);
+			return rv;
+		}
+	}
+
 	return wext_get_hardware_id(ifname, buf);
 }