Remove .la libtool library files

[openwrt.git] / package / openwrt / wlcompat.c

diff --git a/package/openwrt/wlcompat.c b/package/openwrt/wlcompat.c
index cce64e7..5245ab5 100644 (file)
--- a/package/openwrt/wlcompat.c
+++ b/package/openwrt/wlcompat.c
@@ -81,7 +81,7 @@ static int wlcompat_ioctl_getiwrange(struct net_device *dev,
        range->max_pmt = 65535 * 1000;
 
        range->txpower_capa = IW_TXPOW_MWATT;
-       
+
        return 0;
 }
 
@@ -90,8 +90,6 @@ static int wlcompat_ioctl(struct net_device *dev,
                         union iwreq_data *wrqu,
                         char *extra)
 {
-       int err = 0;
-       
        switch (info->cmd) {
                case SIOCGIWNAME:
                        strcpy(wrqu->name, "IEEE 802.11-DS");
@@ -99,45 +97,96 @@ static int wlcompat_ioctl(struct net_device *dev,
                case SIOCGIWFREQ:
                {
                        channel_info_t ci;
-                       wl_ioctl(dev,WLC_GET_CHANNEL, &ci, sizeof(ci));
+
+                       if (wl_ioctl(dev,WLC_GET_CHANNEL, &ci, sizeof(ci)) < 0)
+                               return -EINVAL;
+
                        wrqu->freq.m = ci.target_channel;
                        wrqu->freq.e = 0;
                        break;
                }
+               case SIOCSIWFREQ:
+               {
+                       if (wrqu->freq.e == 1) {
+                               int channel = 0;
+                               int f = wrqu->freq.m / 100000;
+                               while ((channel < NUM_CHANNELS + 1) && (f != channel_frequency[channel]))
+                                       channel++;
+                               
+                               if (channel == NUM_CHANNELS) // channel not found
+                                       return -EINVAL;
+
+                               wrqu->freq.e = 0;
+                               wrqu->freq.m = channel + 1;
+                       }
+                       if ((wrqu->freq.e == 0) && (wrqu->freq.m < 1000)) {
+                               if (wl_ioctl(dev, WLC_SET_CHANNEL, &wrqu->freq.m, sizeof(int)) < 0)
+                                       return -EINVAL;
+                       } else {
+                               return -EINVAL;
+                       }
+               }
                case SIOCGIWAP:
                {
                        wrqu->ap_addr.sa_family = ARPHRD_ETHER;
-                       wl_ioctl(dev,WLC_GET_BSSID,wrqu->ap_addr.sa_data,6);
+                       if (wl_ioctl(dev,WLC_GET_BSSID,wrqu->ap_addr.sa_data,6) < 0)
+                               return -EINVAL;
                        break;
                }
                case SIOCGIWESSID:
                {
                        wlc_ssid_t ssid;
-                       wl_ioctl(dev,WLC_GET_SSID, &ssid, sizeof(wlc_ssid_t));
+                       
+                       if (wl_ioctl(dev,WLC_GET_SSID, &ssid, sizeof(wlc_ssid_t)) < 0)
+                               return -EINVAL;
+
                        wrqu->essid.flags = wrqu->data.flags = 1;
                        wrqu->essid.length = wrqu->data.length = ssid.SSID_len + 1;
                        memcpy(extra,ssid.SSID,ssid.SSID_len + 1);
                        break;
                }
+               case SIOCSIWESSID:
+               {
+                       wlc_ssid_t ssid;
+                       memset(&ssid, 0, sizeof(ssid));
+                       ssid.SSID_len = strlen(extra);
+                       if (ssid.SSID_len > WLC_ESSID_MAX_SIZE)
+                               ssid.SSID_len = WLC_ESSID_MAX_SIZE;
+                       memcpy(ssid.SSID, extra, ssid.SSID_len);
+                       if (wl_ioctl(dev, WLC_SET_SSID, &ssid, sizeof(ssid)) < 0)
+                               return -EINVAL;
+                       break;
+               }
                case SIOCGIWRTS:
                {
-                       wl_ioctl(dev,WLC_GET_RTS,&(wrqu->rts.value),sizeof(int));
+                       if (wl_ioctl(dev,WLC_GET_RTS,&(wrqu->rts.value),sizeof(int)) < 0) 
+                               return -EINVAL;
                        break;
                }
                case SIOCGIWFRAG:
                {
-                       wl_ioctl(dev,WLC_GET_FRAG,&(wrqu->frag.value),sizeof(int));
+                       if (wl_ioctl(dev,WLC_GET_FRAG,&(wrqu->frag.value),sizeof(int)) < 0)
+                               return -EINVAL;
                        break;
                }
                case SIOCGIWTXPOW:
                {
                        wrqu->txpower.value = 0;
-                       wl_ioctl(dev,WLC_GET_TXPWR, &(wrqu->txpower.value), sizeof(int));
+                       if (wl_ioctl(dev,WLC_GET_TXPWR, &(wrqu->txpower.value), sizeof(int)) < 0)
+                               return -EINVAL;
                        wrqu->txpower.fixed = 0;
                        wrqu->txpower.disabled = 0;
                        wrqu->txpower.flags = IW_TXPOW_MWATT;
                        break;
                }
+               case SIOCSIWTXPOW:
+               {
+                       if (wrqu->txpower.flags != IW_TXPOW_MWATT)
+                               return -EINVAL;
+
+                       if (wl_ioctl(dev, WLC_SET_TXPWR, &wrqu->txpower.value, sizeof(int)) < 0)
+                               return -EINVAL;
+               }
                case SIOCGIWENCODE:
                {
                        wrqu->data.flags = IW_ENCODE_DISABLED;
@@ -145,12 +194,16 @@ static int wlcompat_ioctl(struct net_device *dev,
                }
                case SIOCGIWRANGE:
                {
-                       err = wlcompat_ioctl_getiwrange(dev, extra);
+                       return wlcompat_ioctl_getiwrange(dev, extra);
                        break;
                }
+               default:
+               {
+                       return -EINVAL;
+               }
        }
        
-       return err;
+       return 0;
 }
 
 static const iw_handler         wlcompat_handler[] = {
@@ -158,7 +211,7 @@ static const iw_handler      wlcompat_handler[] = {
        wlcompat_ioctl,         /* SIOCGIWNAME */
        NULL,                   /* SIOCSIWNWID */
        NULL,                   /* SIOCGIWNWID */
-       NULL,                   /* SIOCSIWFREQ */
+       wlcompat_ioctl,         /* SIOCSIWFREQ */
        wlcompat_ioctl,         /* SIOCGIWFREQ */
        NULL,                   /* SIOCSIWMODE */
        NULL,                   /* SIOCGIWMODE */
@@ -180,7 +233,7 @@ static const iw_handler      wlcompat_handler[] = {
        NULL,                   /* SIOCGIWAPLIST */
        NULL,                   /* -- hole -- */
        NULL,                   /* -- hole -- */
-       NULL,                   /* SIOCSIWESSID */
+       wlcompat_ioctl,         /* SIOCSIWESSID */
        wlcompat_ioctl,         /* SIOCGIWESSID */
        NULL,                   /* SIOCSIWNICKN */
        NULL,                   /* SIOCGIWNICKN */
@@ -192,7 +245,7 @@ static const iw_handler      wlcompat_handler[] = {
        wlcompat_ioctl,         /* SIOCGIWRTS */
        NULL,                   /* SIOCSIWFRAG */
        wlcompat_ioctl,         /* SIOCGIWFRAG */
-       NULL,                   /* SIOCSIWTXPOW */
+       wlcompat_ioctl,         /* SIOCSIWTXPOW */
        wlcompat_ioctl,         /* SIOCGIWTXPOW */
        NULL,                   /* SIOCSIWRETRY */
        NULL,                   /* SIOCGIWRETRY */