Commit b170b12d authored by Jean Tourrilhes's avatar Jean Tourrilhes Committed by Linus Torvalds

[PATCH] WE-16 for Wavelan Pcmcia driver

        This patch update the Wavelan Pcmcia driver for Wireless
Extensions 16, and also remove all the backward compatibility cruft
that is broken anyway.
parent 7f1b57d8
This diff is collapsed.
...@@ -443,9 +443,7 @@ ...@@ -443,9 +443,7 @@
#ifdef CONFIG_NET_RADIO #ifdef CONFIG_NET_RADIO
#include <linux/wireless.h> /* Wireless extensions */ #include <linux/wireless.h> /* Wireless extensions */
#if WIRELESS_EXT > 12 #include <net/iw_handler.h> /* New driver API */
#include <net/iw_handler.h>
#endif /* WIRELESS_EXT > 12 */
#endif #endif
/* Pcmcia headers that we need */ /* Pcmcia headers that we need */
...@@ -527,13 +525,6 @@ static const char *version = "wavelan_cs.c : v24 (SMP + wireless extensions) 11/ ...@@ -527,13 +525,6 @@ static const char *version = "wavelan_cs.c : v24 (SMP + wireless extensions) 11/
/* ------------------------ PRIVATE IOCTL ------------------------ */ /* ------------------------ PRIVATE IOCTL ------------------------ */
/* Wireless Extension Backward compatibility - Jean II
* If the new wireless device private ioctl range is not defined,
* default to standard device private ioctl range */
#ifndef SIOCIWFIRSTPRIV
#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE
#endif /* SIOCIWFIRSTPRIV */
#define SIOCSIPQTHR SIOCIWFIRSTPRIV /* Set quality threshold */ #define SIOCSIPQTHR SIOCIWFIRSTPRIV /* Set quality threshold */
#define SIOCGIPQTHR SIOCIWFIRSTPRIV + 1 /* Get quality threshold */ #define SIOCGIPQTHR SIOCIWFIRSTPRIV + 1 /* Get quality threshold */
#define SIOCSIPROAM SIOCIWFIRSTPRIV + 2 /* Set roaming state */ #define SIOCSIPROAM SIOCIWFIRSTPRIV + 2 /* Set roaming state */
...@@ -605,16 +596,6 @@ typedef struct iw_freq iw_freq; ...@@ -605,16 +596,6 @@ typedef struct iw_freq iw_freq;
typedef struct net_local net_local; typedef struct net_local net_local;
typedef struct timer_list timer_list; typedef struct timer_list timer_list;
#if WIRELESS_EXT <= 12
/* Wireless extensions backward compatibility */
/* Part of iw_handler prototype we need */
struct iw_request_info
{
__u16 cmd; /* Wireless Extension command */
__u16 flags; /* More to come ;-) */
};
#endif /* WIRELESS_EXT <= 12 */
/* Basic types */ /* Basic types */
typedef u_char mac_addr[WAVELAN_ADDR_SIZE]; /* Hardware address */ typedef u_char mac_addr[WAVELAN_ADDR_SIZE]; /* Hardware address */
...@@ -647,13 +628,10 @@ struct net_local ...@@ -647,13 +628,10 @@ struct net_local
#ifdef WIRELESS_EXT #ifdef WIRELESS_EXT
iw_stats wstats; /* Wireless specific stats */ iw_stats wstats; /* Wireless specific stats */
struct iw_spy_data spy_data;
#endif #endif
#ifdef WIRELESS_SPY
int spy_number; /* Number of addresses to spy */
mac_addr spy_address[IW_MAX_SPY]; /* The addresses to spy */
iw_qual spy_stat[IW_MAX_SPY]; /* Statistics gathered */
#endif /* WIRELESS_SPY */
#ifdef HISTOGRAM #ifdef HISTOGRAM
int his_number; /* Number of intervals */ int his_number; /* Number of intervals */
u_char his_range[16]; /* Boundaries of interval ]n-1; n] */ u_char his_range[16]; /* Boundaries of interval ]n-1; n] */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment