diff options
author | Alexander Beregalov <a.beregalov@gmail.com> | 2009-07-03 16:25:52 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:33 -0700 |
commit | 92e6765f4080520759acfb0bc41402485271365a (patch) | |
tree | 235b3023e428b864a2064ac62d567bcf797e9a3f /drivers/staging/otus/ioctl.c | |
parent | 4a5629b92ee530e7c3077689d5efb90be613a9a5 (diff) | |
download | op-kernel-dev-92e6765f4080520759acfb0bc41402485271365a.zip op-kernel-dev-92e6765f4080520759acfb0bc41402485271365a.tar.gz |
Staging: otus: remove dependency on WIRELESS_EXT version
As the driver is in mainline now we can remove such dependency.
WIRELESS_EXT is 22 now and it is always defined.
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/otus/ioctl.c')
-rw-r--r-- | drivers/staging/otus/ioctl.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/staging/otus/ioctl.c b/drivers/staging/otus/ioctl.c index dd32705..6808e69 100644 --- a/drivers/staging/otus/ioctl.c +++ b/drivers/staging/otus/ioctl.c @@ -58,9 +58,7 @@ #define ZD_MAX_KEY_SIZE 32 #define ZD_MAX_GENERIC_SIZE 64 -#if WIRELESS_EXT > 12 #include <net/iw_handler.h> -#endif extern u16_t zfLnxGetVapId(zdev_t *dev); @@ -248,7 +246,6 @@ int usbdrv_ioctl_setrts(struct net_device *dev, struct iw_param *rrq) return 0; } -#if WIRELESS_EXT > 14 /* * Encode a WPA or RSN information element as a custom * element using the hostap format. @@ -269,7 +266,6 @@ u32 encode_ie(void *buf, u32 bufsize, const u8 *ie, u32 ielen, p += sprintf(p, "%02x", ie[i]); return (i == ielen ? p - (u8 *)buf:0); } -#endif /* WIRELESS_EXT > 14 */ /* * Translate scan data returned from the card to a card independent @@ -284,9 +280,7 @@ char *usbdrv_translate_scan(struct net_device *dev, char *current_val; /* For rates */ char *last_ev; int i; - #if WIRELESS_EXT > 14 - char buf[64*2 + 30]; - #endif + char buf[64*2 + 30]; last_ev = current_ev; @@ -365,10 +359,8 @@ char *usbdrv_translate_scan(struct net_device *dev, /* Add quality statistics */ iwe.cmd = IWEVQUAL; - #if WIRELESS_EXT > 18 iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED | IW_QUAL_NOISE_UPDATED; - #endif iwe.u.qual.level = list->signalStrength; iwe.u.qual.noise = 0; iwe.u.qual.qual = list->signalQuality; @@ -441,7 +433,6 @@ char *usbdrv_translate_scan(struct net_device *dev, /* Check if we added any event */ if ((current_val - current_ev) > IW_EV_LCP_LEN) current_ev = current_val; - #if WIRELESS_EXT > 14 #define IEEE80211_ELEMID_RSN 0x30 memset(&iwe, 0, sizeof(iwe)); iwe.cmd = IWEVCUSTOM; @@ -503,7 +494,6 @@ char *usbdrv_translate_scan(struct net_device *dev, last_ev = current_ev; } } - #endif /* The other data in the scan result are not really * interesting, so for now drop it */ @@ -697,12 +687,9 @@ int usbdrvwext_giwrange(struct net_device *dev, if (!netif_running(dev)) return -EINVAL; - #if WIRELESS_EXT > 9 range->txpower_capa = IW_TXPOW_DBM; /* XXX what about min/max_pmp, min/max_pmt, etc. */ - #endif - #if WIRELESS_EXT > 10 range->we_version_compiled = WIRELESS_EXT; range->we_version_source = 13; @@ -710,7 +697,6 @@ int usbdrvwext_giwrange(struct net_device *dev, range->retry_flags = IW_RETRY_LIMIT; range->min_retry = 0; range->max_retry = 255; - #endif /* WIRELESS_EXT > 10 */ channel_num = zfiWlanQueryAllowChannels(dev, channels); @@ -917,13 +903,11 @@ int usbdrvwext_giwscan(struct net_device *dev, current_ev = usbdrv_translate_scan(dev, info, current_ev, end_buf, &pBssList->bssInfo[i]); - #if WIRELESS_EXT > 16 if (current_ev == end_buf) { kfree(pBssList); data->length = current_ev - extra; return -E2BIG; } - #endif } /* Length of data */ |