diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2011-03-29 17:56:05 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-04 22:58:06 -0700 |
commit | 8efba264d45d0af4b7c64373262dbcc01059b602 (patch) | |
tree | b12bc72260011665be8c5391aa342e8c59f39130 /drivers/staging/ath6kl/os/linux/wireless_ext.c | |
parent | 9d72a9e13a150124862b74c658271736297709f4 (diff) | |
download | op-kernel-dev-8efba264d45d0af4b7c64373262dbcc01059b602.zip op-kernel-dev-8efba264d45d0af4b7c64373262dbcc01059b602.tar.gz |
ath6kl: kill Android specific code
To get upstream we can't use out of tree defines, kill
all the androidisms. ath6kl won't be usable on Android
unless external patches are supported later or Android
gets their shit together and gets all their crap upstream.
Cc: Naveen Singh <nsingh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ath6kl/os/linux/wireless_ext.c')
-rw-r--r-- | drivers/staging/ath6kl/os/linux/wireless_ext.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/drivers/staging/ath6kl/os/linux/wireless_ext.c b/drivers/staging/ath6kl/os/linux/wireless_ext.c index 4b77943..5af09f1 100644 --- a/drivers/staging/ath6kl/os/linux/wireless_ext.c +++ b/drivers/staging/ath6kl/os/linux/wireless_ext.c @@ -2499,39 +2499,6 @@ ar6000_ioctl_siwscan(struct net_device *dev, } } -#ifdef ANDROID_ENV -#if WIRELESS_EXT >= 18 - if (data->pointer && (data->length == sizeof(struct iw_scan_req))) - { - if ((data->flags & IW_SCAN_THIS_ESSID) == IW_SCAN_THIS_ESSID) - { - struct iw_scan_req req; - if (copy_from_user(&req, data->pointer, sizeof(struct iw_scan_req))) - return -EIO; - if (wmi_probedSsid_cmd(ar->arWmi, 1, SPECIFIC_SSID_FLAG, req.essid_len, req.essid) != 0) - return -EIO; - ar->scanSpecificSsid = true; - } - else - { - if (ar->scanSpecificSsid) { - if (wmi_probedSsid_cmd(ar->arWmi, 1, DISABLE_SSID_FLAG, 0, NULL) != 0) - return -EIO; - ar->scanSpecificSsid = false; - } - } - } - else - { - if (ar->scanSpecificSsid) { - if (wmi_probedSsid_cmd(ar->arWmi, 1, DISABLE_SSID_FLAG, 0, NULL) != 0) - return -EIO; - ar->scanSpecificSsid = false; - } - } -#endif -#endif /* ANDROID_ENV */ - if (wmi_startscan_cmd(ar->arWmi, WMI_LONG_SCAN, false, false, \ 0, 0, 0, NULL) != 0) { ret = -EIO; |