From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 6 Dec 2011 13:24:47 +0000 (+0000)
Subject: iwinfo: support nl80211 hardware identification against radioX pseudo interfaces... 
X-Git-Tag: reboot~15356
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=843452730565e43ca70a2572681b651690c0789b;p=openwrt%2Fstaging%2Fnoltari.git

iwinfo: support nl80211 hardware identification against radioX pseudo interfaces, useful if radio is not up yet

SVN-Revision: 29462
---

diff --git a/package/iwinfo/Makefile b/package/iwinfo/Makefile
index 471904432e..f69b86e8f7 100644
--- a/package/iwinfo/Makefile
+++ b/package/iwinfo/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libiwinfo
-PKG_RELEASE:=20
+PKG_RELEASE:=21
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/package/iwinfo/src/iwinfo_nl80211.c b/package/iwinfo/src/iwinfo_nl80211.c
index 4b8b37daa8..4672b9d640 100644
--- a/package/iwinfo/src/iwinfo_nl80211.c
+++ b/package/iwinfo/src/iwinfo_nl80211.c
@@ -1631,6 +1631,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);
 }