aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2003-07-10 07:29:58 (GMT)
committerJouni Malinen <j@w1.fi>2003-07-10 07:29:58 (GMT)
commit07a7d36fdf1048d08cc0509036e1132af245cc02 (patch)
tree30c7279b5c958d737f979c61483b818d44011aac
parentbdb841412163e5f3a0c874041aae7e723b0ee133 (diff)
downloadhostap-history-07a7d36fdf1048d08cc0509036e1132af245cc02.zip
hostap-history-07a7d36fdf1048d08cc0509036e1132af245cc02.tar.gz
hostap-history-07a7d36fdf1048d08cc0509036e1132af245cc02.tar.bz2
Removed backward compatibility code for Linux Wireless Extensions versions
older than ver 9. All supported Linux version (2.2.x, 2.4.x, 2.5.x) have had ver 9 or newer available for a long time so this should not be a major issue.
-rw-r--r--ChangeLog2
-rw-r--r--driver/modules/hostap_ioctl.c27
-rw-r--r--driver/modules/hostap_wext.h10
3 files changed, 6 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog
index 245cfa6..d630ad7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@ ChangeLog for Host AP driver for Intersil Prism2/2.5/3
* fixed inactivity expiration of stations using power saving mode
* fixed sending of IEEE 802.1X frames to buffer them if STA is in power
saving mode
+ * removed backward compatibility code for Linux Wireless Extensions
+ versions older than ver 9
2003-05-18 - v0.0.3
* redesigned RADIUS client implementation
diff --git a/driver/modules/hostap_ioctl.c b/driver/modules/hostap_ioctl.c
index 4ad04f6..2f8b228 100644
--- a/driver/modules/hostap_ioctl.c
+++ b/driver/modules/hostap_ioctl.c
@@ -130,7 +130,6 @@ static void prism2_crypt_delayed_deinit(local_info_t *local,
}
-#if WIRELESS_EXT > 8
static int prism2_ioctl_siwencode(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *erq, char *keybuf)
@@ -598,7 +597,6 @@ static int prism2_ioctl_giwfrag(struct net_device *dev,
return 0;
}
-#endif /* WIRELESS_EXT > 8 */
static int prism2_ioctl_siwap(struct net_device *dev,
@@ -658,7 +656,6 @@ static int prism2_ioctl_giwap(struct net_device *dev,
}
-#if WIRELESS_EXT > 8
static int prism2_ioctl_siwnickn(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *data, char *nickname)
@@ -697,7 +694,6 @@ static int prism2_ioctl_giwnickn(struct net_device *dev,
return 0;
}
-#endif /* WIRELESS_EXT > 8 */
static int prism2_ioctl_siwfreq(struct net_device *dev,
@@ -771,7 +767,6 @@ static void hostap_monitor_set_type(local_info_t *local)
}
-#if WIRELESS_EXT > 8
static int prism2_ioctl_siwessid(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *data, char *ssid)
@@ -1163,7 +1158,6 @@ static int prism2_ioctl_giwpower(struct net_device *dev,
return 0;
#endif /* PRISM2_NO_STATION_MODES */
}
-#endif /* WIRELESS_EXT > 8 */
#if WIRELESS_EXT > 10
@@ -1735,7 +1729,6 @@ static int prism2_ioctl_giwscan(struct net_device *dev,
#endif /* WIRELESS_EXT > 13 */
-#if WIRELESS_EXT > 8
static const struct iw_priv_args prism2_priv[] = {
{ PRISM2_IOCTL_MONITOR,
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "monitor" },
@@ -1950,7 +1943,6 @@ static int prism2_ioctl_giwpriv(struct net_device *dev, struct iw_point *data)
return 0;
}
#endif /* WIRELESS_EXT <= 12 */
-#endif /* WIRELESS_EXT > 8 */
static int prism2_ioctl_priv_inquire(struct net_device *dev, int *i)
@@ -2523,7 +2515,6 @@ static int prism2_ioctl_priv_writemif(struct net_device *dev,
static int prism2_ioctl_priv_monitor(struct net_device *dev, int *i)
{
-#if WIRELESS_EXT > 8
local_info_t *local = (local_info_t *) dev->priv;
int ret = 0;
u32 mode;
@@ -2561,9 +2552,6 @@ static int prism2_ioctl_priv_monitor(struct net_device *dev, int *i)
ret = -EINVAL;
return ret;
-#else /* WIRELESS_EXT > 8 */
- return -EOPNOTSUPP;
-#endif /* WIRELESS_EXT > 8 */
}
@@ -2734,7 +2722,7 @@ static int ap_mac_ioctl(local_info_t *local, char *macstr, int cmd)
#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
-#if defined(PRISM2_DOWNLOAD_SUPPORT) && WIRELESS_EXT > 8
+#ifdef PRISM2_DOWNLOAD_SUPPORT
static int prism2_ioctl_priv_download(local_info_t *local, struct iw_point *p)
{
struct prism2_download_param *param;
@@ -2768,7 +2756,7 @@ static int prism2_ioctl_priv_download(local_info_t *local, struct iw_point *p)
return ret;
}
-#endif /* PRISM2_DOWNLOAD_SUPPORT and WIRELESS_EXT > 8 */
+#endif /* PRISM2_DOWNLOAD_SUPPORT */
static int prism2_ioctl_set_encryption(local_info_t *local,
@@ -3167,7 +3155,6 @@ int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
ret = prism2_ioctl_giwap(dev, NULL, &wrq->u.ap_addr, NULL);
break;
-#if WIRELESS_EXT > 8
case SIOCSIWESSID:
if (!wrq->u.essid.pointer)
ret = -EINVAL;
@@ -3342,7 +3329,6 @@ int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
case SIOCGIWPRIV:
ret = prism2_ioctl_giwpriv(dev, &wrq->u.data);
break;
-#endif /* WIRELESS_EXT > 8 */
#if WIRELESS_EXT > 9
case SIOCSIWTXPOW:
@@ -3530,21 +3516,16 @@ int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
/* Private ioctls that are not used with iwpriv;
* in SIOCDEVPRIVATE range */
-#if defined(PRISM2_DOWNLOAD_SUPPORT) && WIRELESS_EXT > 8
+#ifdef PRISM2_DOWNLOAD_SUPPORT
case PRISM2_IOCTL_DOWNLOAD:
if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
else ret = prism2_ioctl_priv_download(local, &wrq->u.data);
break;
-#endif /* PRISM2_DOWNLOAD_SUPPORT and WIRELESS_EXT > 8 */
+#endif /* PRISM2_DOWNLOAD_SUPPORT */
case PRISM2_IOCTL_HOSTAPD:
if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
-#if WIRELESS_EXT > 8
else ret = prism2_ioctl_priv_hostapd(local, &wrq->u.data);
-#else /* WIRELESS_EXT > 8 */
- else ret = prism2_ioctl_priv_hostapd(
- local, (struct iw_point *) &wrq->u.data);
-#endif /* WIRELESS_EXT > 8 */
break;
default:
diff --git a/driver/modules/hostap_wext.h b/driver/modules/hostap_wext.h
index 88f3777..c05da6d 100644
--- a/driver/modules/hostap_wext.h
+++ b/driver/modules/hostap_wext.h
@@ -72,16 +72,6 @@ struct iw_request_info;
#endif /* IW_PRIV_TYPE_ADDR */
#endif /* PRISM2_USE_WE_TYPE_ADDR */
-
-#if WIRELESS_EXT < 9
-struct iw_point {
- caddr_t pointer;
- __u16 length;
- __u16 flags;
-};
-#endif /* WIRELESS_EXT < 9 */
-
#endif /* WIRELESS_EXT */
-
#endif /* HOSTAP_WEXT_H */