Commit a5220ff4 authored by Jean Tourrilhes's avatar Jean Tourrilhes Committed by Jeff Garzik

Update (ancient) wireless net drivers netwave_cs, wavelan,

and wavelan_cs to new wireless API.
parent 74a4e27a
This diff is collapsed.
This diff is collapsed.
...@@ -345,6 +345,12 @@ ...@@ -345,6 +345,12 @@
* - Fix spinlock stupid bugs that I left in. The driver is now SMP * - Fix spinlock stupid bugs that I left in. The driver is now SMP
* compliant and doesn't lockup at startup. * compliant and doesn't lockup at startup.
* *
* Changes made for release in 2.5.2 :
* ---------------------------------
* - Use new driver API for Wireless Extensions :
* o got rid of wavelan_ioctl()
* o use a bunch of iw_handler instead
*
* Wishes & dreams: * Wishes & dreams:
* ---------------- * ----------------
* - roaming (see Pcmcia driver) * - roaming (see Pcmcia driver)
...@@ -379,6 +385,7 @@ ...@@ -379,6 +385,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/wireless.h> /* Wireless extensions */ #include <linux/wireless.h> /* Wireless extensions */
#include <net/iw_handler.h> /* Wireless handlers */
/* WaveLAN declarations */ /* WaveLAN declarations */
#include "i82586.h" #include "i82586.h"
...@@ -436,7 +443,7 @@ ...@@ -436,7 +443,7 @@
/************************ CONSTANTS & MACROS ************************/ /************************ CONSTANTS & MACROS ************************/
#ifdef DEBUG_VERSION_SHOW #ifdef DEBUG_VERSION_SHOW
static const char *version = "wavelan.c : v23 (SMP + wireless extensions) 05/10/00\n"; static const char *version = "wavelan.c : v24 (SMP + wireless extensions) 11/12/01\n";
#endif #endif
/* Watchdog temporisation */ /* Watchdog temporisation */
...@@ -449,11 +456,9 @@ static const char *version = "wavelan.c : v23 (SMP + wireless extensions) 05/10/ ...@@ -449,11 +456,9 @@ static const char *version = "wavelan.c : v23 (SMP + wireless extensions) 05/10/
#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 SIOCSIPLTHR SIOCIWFIRSTPRIV + 2 /* Set level threshold */
#define SIOCGIPLTHR SIOCIWFIRSTPRIV + 3 /* Get level threshold */
#define SIOCSIPHISTO SIOCIWFIRSTPRIV + 6 /* Set histogram ranges */ #define SIOCSIPHISTO SIOCIWFIRSTPRIV + 2 /* Set histogram ranges */
#define SIOCGIPHISTO SIOCIWFIRSTPRIV + 7 /* Get histogram values */ #define SIOCGIPHISTO SIOCIWFIRSTPRIV + 3 /* Get histogram values */
/****************************** TYPES ******************************/ /****************************** TYPES ******************************/
......
This diff is collapsed.
...@@ -394,6 +394,12 @@ ...@@ -394,6 +394,12 @@
* o control first busy loop in wv_82593_cmd() * o control first busy loop in wv_82593_cmd()
* o Extend spinlock protection in wv_hw_config() * o Extend spinlock protection in wv_hw_config()
* *
* Changes made for release in 3.1.33 :
* ----------------------------------
* - Optional use new driver API for Wireless Extensions :
* o got rid of wavelan_ioctl()
* o use a bunch of iw_handler instead
*
* Wishes & dreams: * Wishes & dreams:
* ---------------- * ----------------
* - Cleanup and integrate the roaming code * - Cleanup and integrate the roaming code
...@@ -430,6 +436,9 @@ ...@@ -430,6 +436,9 @@
#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>
#endif /* WIRELESS_EXT > 12 */
#endif #endif
/* Pcmcia headers that we need */ /* Pcmcia headers that we need */
...@@ -498,7 +507,7 @@ ...@@ -498,7 +507,7 @@
/************************ CONSTANTS & MACROS ************************/ /************************ CONSTANTS & MACROS ************************/
#ifdef DEBUG_VERSION_SHOW #ifdef DEBUG_VERSION_SHOW
static const char *version = "wavelan_cs.c : v23 (SMP + wireless extensions) 20/12/00\n"; static const char *version = "wavelan_cs.c : v24 (SMP + wireless extensions) 11/1/02\n";
#endif #endif
/* Watchdog temporisation */ /* Watchdog temporisation */
...@@ -523,8 +532,8 @@ static const char *version = "wavelan_cs.c : v23 (SMP + wireless extensions) 20/ ...@@ -523,8 +532,8 @@ static const char *version = "wavelan_cs.c : v23 (SMP + wireless extensions) 20/
#define SIOCSIPROAM SIOCIWFIRSTPRIV + 2 /* Set roaming state */ #define SIOCSIPROAM SIOCIWFIRSTPRIV + 2 /* Set roaming state */
#define SIOCGIPROAM SIOCIWFIRSTPRIV + 3 /* Get roaming state */ #define SIOCGIPROAM SIOCIWFIRSTPRIV + 3 /* Get roaming state */
#define SIOCSIPHISTO SIOCIWFIRSTPRIV + 6 /* Set histogram ranges */ #define SIOCSIPHISTO SIOCIWFIRSTPRIV + 4 /* Set histogram ranges */
#define SIOCGIPHISTO SIOCIWFIRSTPRIV + 7 /* Get histogram values */ #define SIOCGIPHISTO SIOCIWFIRSTPRIV + 5 /* Get histogram values */
/*************************** WaveLAN Roaming **************************/ /*************************** WaveLAN Roaming **************************/
#ifdef WAVELAN_ROAMING /* Conditional compile, see above in options */ #ifdef WAVELAN_ROAMING /* Conditional compile, see above in options */
...@@ -589,6 +598,16 @@ typedef struct iw_freq iw_freq; ...@@ -589,6 +598,16 @@ 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 */
......
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