nl80211: remove redundant check in nl80211_phy2ifname()

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

Signed-off-by: Andre Heider <a.heider@gmail.com>

diff --git a/iwinfo_nl80211.c b/iwinfo_nl80211.c
index 7a67467b7deb5f422f95c7688b3c266c9e5e12f2..6b2a87ad6157fd615c72e101284e10e2ccc3bc1c 100644 (file)
--- a/iwinfo_nl80211.c
+++ b/iwinfo_nl80211.c
@@ -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;