DGNum/iwinfo
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nl80211: remove redundant check in nl80211_phy2ifname()

Browse source 
phyidx is already checked for <0 a few lines above.

Signed-off-by: Andre Heider <a.heider@gmail.com>
This commit is contained in:
Andre Heider 2022-12-24 11:45:43 +01:00 • committed by Christian Marangi
parent 0172c97759
commit acbf4fe47d
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
iwinfo_nl80211.c
View file

@ -826,31 +826,28 @@ static char * nl80211_phy2ifname(const char *ifname)
memset(nif, 0, sizeof(nif));
if (phyidx > -1)
if ((d = opendir("/sys/class/net")) != NULL)
{
if ((d = opendir("/sys/class/net")) != NULL)
while ((e = readdir(d)) != NULL)
{
while ((e = readdir(d)) != NULL)
snprintf(buffer, sizeof(buffer),
"/sys/class/net/%s/phy80211/index", e->d_name);
if (nl80211_readint(buffer) == phyidx)
{
snprintf(buffer, sizeof(buffer),
"/sys/class/net/%s/phy80211/index", e->d_name);
"/sys/class/net/%s/ifindex", e->d_name);
if (nl80211_readint(buffer) == phyidx)
if ((cifidx = nl80211_readint(buffer)) >= 0 &&
((ifidx < 0) || (cifidx < ifidx)))
{
snprintf(buffer, sizeof(buffer),
"/sys/class/net/%s/ifindex", e->d_name);
if ((cifidx = nl80211_readint(buffer)) >= 0 &&
((ifidx < 0) || (cifidx < ifidx)))
{
ifidx = cifidx;
strncpy(nif, e->d_name, sizeof(nif) - 1);
}
ifidx = cifidx;
strncpy(nif, e->d_name, sizeof(nif) - 1);
}
}
closedir(d);
}
closedir(d);
}
return nif[0] ? nif : NULL;