libs/iwinfo: Respect IW_TXPOW_DBM flag over IW_TXPOW_MWATT when both are set

[project/luci.git] / libs / iwinfo / src / iwinfo_wext.c

diff --git a/libs/iwinfo/src/iwinfo_wext.c b/libs/iwinfo/src/iwinfo_wext.c
index eebaea6..2a1b685 100644 (file)
--- a/libs/iwinfo/src/iwinfo_wext.c
+++ b/libs/iwinfo/src/iwinfo_wext.c
@@ -373,17 +373,18 @@ int wext_get_txpwrlist(const char *ifname, char *buf, int *len)
        ) {
                for( i = 0; i < range.num_txpower; i++ )
                {
-                       if( range.txpower_capa & IW_TXPOW_MWATT )
-                       {
-                               entry.dbm = wext_mw2dbm(range.txpower[i]);
-                               entry.mw  = range.txpower[i];
-                       }
-                       else
+                       if( range.txpower_capa & IW_TXPOW_DBM )
                        {
                                entry.dbm = range.txpower[i];
                                entry.mw  = wext_dbm2mw(range.txpower[i]);
                        }
 
+                       else if( range.txpower_capa & IW_TXPOW_MWATT )
+                       {
+                               entry.dbm = wext_mw2dbm(range.txpower[i]);
+                               entry.mw  = range.txpower[i];
+                       }
+
                        memcpy(&buf[i*sizeof(entry)], &entry, sizeof(entry));
                }