X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fiwinfo%2Fsrc%2Fiwinfo_wext.c;fp=contrib%2Fpackage%2Fiwinfo%2Fsrc%2Fiwinfo_wext.c;h=5300f1b0271160a901b73e4deab1e3722acea36c;hp=5eecd0da4d2c1c177a76d3b1b8c1747b55cc01b6;hb=6ef55ba3276ba85cb30d07c528266d92067725d4;hpb=50bd4a979be2f56e9872f3a4dcd3c17fc4334957

diff --git a/contrib/package/iwinfo/src/iwinfo_wext.c b/contrib/package/iwinfo/src/iwinfo_wext.c
index 5eecd0da4..5300f1b02 100644
--- a/contrib/package/iwinfo/src/iwinfo_wext.c
+++ b/contrib/package/iwinfo/src/iwinfo_wext.c
@@ -405,16 +405,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_DBM )
+			if( range.txpower_capa & IW_TXPOW_MWATT )
 			{
-				entry.dbm = range.txpower[i];
-				entry.mw  = wext_dbm2mw(range.txpower[i]);
+				entry.dbm = wext_mw2dbm(range.txpower[i]);
+				entry.mw  = range.txpower[i];
 			}
 
-			else if( range.txpower_capa & IW_TXPOW_MWATT )
+			/* Madwifi does neither set mW not dBm caps, also iwlist assumes
+			 * dBm if mW is not set, so don't check here... */
+			else /* if( range.txpower_capa & IW_TXPOW_DBM ) */
 			{
-				entry.dbm = wext_mw2dbm(range.txpower[i]);
-				entry.mw  = range.txpower[i];
+				entry.dbm = range.txpower[i];
+				entry.mw  = wext_dbm2mw(range.txpower[i]);
 			}
 
 			memcpy(&buf[i*sizeof(entry)], &entry, sizeof(entry));