libiwinfo: madwifi fixes, use direct ioctl calls for vap creation, ifup and ifdown...

[project/luci.git] / contrib / package / iwinfo / src / iwinfo_wext.c

diff --git a/contrib/package/iwinfo/src/iwinfo_wext.c b/contrib/package/iwinfo/src/iwinfo_wext.c
index 298fd93..5300f1b 100644 (file)
--- 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));
@@ -471,6 +473,33 @@ int wext_get_countrylist(const char *ifname, char *buf, int *len)
        return -1;
 }
 
+int wext_get_hwmodelist(const char *ifname, int *buf)
+{
+       char chans[IWINFO_BUFSIZE] = { 0 };
+       struct iwinfo_freqlist_entry *e = NULL;
+       int len = 0;
+
+       if( !wext_get_freqlist(ifname, chans, &len) )
+       {
+               for( e = (struct iwinfo_freqlist_entry *)chans; e->channel; e++ )
+               {
+                       if( e->channel <= 14 )
+                       {
+                               *buf |= IWINFO_80211_B;
+                               *buf |= IWINFO_80211_G;
+                       }
+                       else
+                       {
+                               *buf |= IWINFO_80211_A;
+                       }
+               }
+
+               return 0;
+       }
+
+       return -1;
+}
+
 int wext_get_encryption(const char *ifname, char *buf)
 {
        /* No reliable crypto info in wext */