From: Andre Heider Date: Mon, 30 Jan 2023 18:57:57 +0000 (+0100) Subject: nl80211: restore iterating over all devices in nl80211_phy2ifname() X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c7eb8ebe33de2ff2d08064258edb047e5ac09f29;p=project%2Fiwinfo.git nl80211: restore iterating over all devices in nl80211_phy2ifname() This reverts to the earlier behaviour, because: * phys can be renamed, which breaks hardcoding "phy%d" * /sys/class/ieee80211/*/device can return networks of other phys, since "device" is a symlink which can have multiple phys The earlier behaviour fixes both points. Fixes: 6194aaf0 "nl80211: simplify iterating over phy's devices" Signed-off-by: Andre Heider Tested-by: Olcay Korkmaz [ drop extra Fixes tag related to openwrt issue ] Signed-off-by: Christian Marangi --- diff --git a/iwinfo_nl80211.c b/iwinfo_nl80211.c index 5bc2f51..50bb8f0 100644 --- a/iwinfo_nl80211.c +++ b/iwinfo_nl80211.c @@ -825,13 +825,15 @@ static char * nl80211_phy2ifname(const char *ifname) memset(nif, 0, sizeof(nif)); - snprintf(buffer, sizeof(buffer), - "/sys/class/ieee80211/phy%d/device/net", phyidx); - - if ((d = opendir(buffer)) != NULL) + if ((d = opendir("/sys/class/net")) != NULL) { while ((e = readdir(d)) != NULL) { + snprintf(buffer, sizeof(buffer), + "/sys/class/net/%s/phy80211/index", e->d_name); + if (nl80211_readint(buffer) != phyidx) + continue; + snprintf(buffer, sizeof(buffer), "/sys/class/net/%s/ifindex", e->d_name); cifidx = nl80211_readint(buffer);