[PATCH] WE-21 support (core API)

This is version 21 of the Wireless Extensions. Changelog :
	o finishes migrating the ESSID API (remove the +1)
	o netdev->get_wireless_stats is no more
	o long/short retry

This is a redacted version of a patch originally submitted by Jean
Tourrilhes.  I removed most of the additions, in order to minimize
future support requirements for nl80211 (or other WE successor).

CC: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 20 insertions, 5 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 43289127b458..ac4f50213bc3 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -334,7 +334,6 @@ struct net_device
 
 
         struct net_device_stats* (*get_stats)(struct net_device *dev);
-        struct iw_statistics*   (*get_wireless_stats)(struct net_device *dev);
 
         /* List of functions to handle Wireless Extensions (instead of ioctl).
          * See <net/iw_handler.h> for details. Jean II */
diff --git a/include/linux/wireless.h b/include/linux/wireless.h
index 13588564b42b..a50a0130fd9e 100644
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
@@ -1,7 +1,7 @@
 /*
  * This file define a set of standard wireless extensions
  *
- * Version :    20      17.2.06
+ * Version :    21      14.3.06
  *
  * Authors :    Jean Tourrilhes - HPL - <jt@hpl.hp.com>
  * Copyright (c) 1997-2006 Jean Tourrilhes, All Rights Reserved.
@@ -69,9 +69,14 @@
 
 /***************************** INCLUDES *****************************/
 
+/* This header is used in user-space, therefore need to be sanitised
+ * for that purpose. Those includes are usually not compatible with glibc.
+ * To know which includes to use in user-space, check iwlib.h. */
+#ifdef __KERNEL__
 #include <linux/types.h>                /* for "caddr_t" et al          */
 #include <linux/socket.h>               /* for "struct sockaddr" et al  */
 #include <linux/if.h>                   /* for IFNAMSIZ and co... */
+#endif  /* __KERNEL__ */
 
 /***************************** VERSION *****************************/
 /*
@@ -80,7 +85,7 @@
  * (there is some stuff that will be added in the future...)
  * I just plan to increment with each new version.
  */
-#define WIRELESS_EXT    20
+#define WIRELESS_EXT    21
 
 /*
  * Changes :
@@ -208,6 +213,14 @@
  * V19 to V20
  * ----------
  *      - RtNetlink requests support (SET/GET)
+ *
+ * V20 to V21
+ * ----------
+ *      - Remove (struct net_device *)->get_wireless_stats()
+ *      - Change length in ESSID and NICK to strlen() instead of strlen()+1
+ *      - Add IW_RETRY_SHORT/IW_RETRY_LONG retry modifiers
+ *      - Power/Retry relative values no longer * 100000
+ *      - Add explicit flag to tell stats are in 802.11k RCPI : IW_QUAL_RCPI
  */
 
 /**************************** CONSTANTS ****************************/
@@ -448,6 +461,7 @@
 #define IW_QUAL_QUAL_INVALID    0x10    /* Driver doesn't provide value */
 #define IW_QUAL_LEVEL_INVALID   0x20
 #define IW_QUAL_NOISE_INVALID   0x40
+#define IW_QUAL_RCPI            0x80    /* Level + Noise are 802.11k RCPI */
 #define IW_QUAL_ALL_INVALID     0x70
 
 /* Frequency flags */
@@ -500,10 +514,12 @@
 #define IW_RETRY_TYPE           0xF000  /* Type of parameter */
 #define IW_RETRY_LIMIT          0x1000  /* Maximum number of retries*/
 #define IW_RETRY_LIFETIME       0x2000  /* Maximum duration of retries in us */
-#define IW_RETRY_MODIFIER       0x000F  /* Modify a parameter */
+#define IW_RETRY_MODIFIER       0x00FF  /* Modify a parameter */
 #define IW_RETRY_MIN            0x0001  /* Value is a minimum  */
 #define IW_RETRY_MAX            0x0002  /* Value is a maximum */
 #define IW_RETRY_RELATIVE       0x0004  /* Value is not in seconds/ms/us */
+#define IW_RETRY_SHORT          0x0010  /* Value is for short packets  */
+#define IW_RETRY_LONG           0x0020  /* Value is for long packets */
 
 /* Scanning request flags */
 #define IW_SCAN_DEFAULT         0x0000  /* Default scan of the driver */
@@ -1017,7 +1033,7 @@ struct	iw_range
         /* Note : this frequency list doesn't need to fit channel numbers,
          * because each entry contain its channel index */
 
-        __u32           enc_capa; /* IW_ENC_CAPA_* bit field */
+        __u32           enc_capa;       /* IW_ENC_CAPA_* bit field */
 };
 
 /*