X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-wireless-tools.git;a=blobdiff_plain;f=wireless_tools%2Fwireless.22.h;fp=wireless_tools%2Fwireless.22.h;h=c5788fa041d188dbc2b08ea635a35422a7a6b1a7;hp=9a885db5e4d8b5adfcea923feaaa8215c6146d68;hb=41b8e9b1157054ddcb90e68f1b12707811c90361;hpb=c1074342112d8a4cdc44275b1bc15701aaf7f30b

diff --git a/wireless_tools/wireless.22.h b/wireless_tools/wireless.22.h
index 9a885db..c5788fa 100644
--- a/wireless_tools/wireless.22.h
+++ b/wireless_tools/wireless.22.h
@@ -5,6 +5,12 @@
  *
  * Authors :	Jean Tourrilhes - HPL - <jt@hpl.hp.com>
  * Copyright (c) 1997-2007 Jean Tourrilhes, All Rights Reserved.
+ *
+ * This file, and only this file, is licensed under the terms of the LGPL.
+ * You can redistribute it and/or modify it under the terms of the GNU
+ * Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
  */
 
 #ifndef _LINUX_WIRELESS_H
@@ -210,21 +216,21 @@
  *	- Add explicit flag to tell stats are in dBm : IW_QUAL_DBM
  *	- Add IW_IOCTL_IDX() and IW_EVENT_IDX() macros
  *
- * 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 SIOCSIWMODUL/SIOCGIWMODUL for modulation setting
  *	- Add IW_RETRY_SHORT/IW_RETRY_LONG retry modifiers
+ *	- Add IW_POWER_SAVING power type
  *	- Power/Retry relative values no longer * 100000
+ *	- Add bitrate flags for unicast/broadcast
  *	- Add explicit flag to tell stats are in 802.11k RCPI : IW_QUAL_RCPI
  *
  * V21 to V22
  * ----------
  *	- Prevent leaking of kernel space in stream on 64 bits.
+ *	- Scan capabilities in struct iw_range (Dan Williams)
  */
 
 /**************************** CONSTANTS ****************************/
@@ -355,7 +361,7 @@
 #define SIOCIWLAST	SIOCIWLASTPRIV		/* 0x8BFF */
 #define IW_IOCTL_IDX(cmd)	((cmd) - SIOCIWFIRST)
 
-/* Odd : get (world access), even : set (root access) */
+/* Odd : get (world access), Even : set (root access) */
 #define IW_IS_SET(cmd)	(!((cmd) & 0x1))
 #define IW_IS_GET(cmd)	((cmd) & 0x1)
 
@@ -545,6 +551,16 @@
 /* Maximum size of returned data */
 #define IW_SCAN_MAX_DATA	4096	/* In bytes */
 
+/* Scan capability flags - in (struct iw_range *)->scan_capa */
+#define IW_SCAN_CAPA_NONE		0x00
+#define IW_SCAN_CAPA_ESSID		0x01
+#define IW_SCAN_CAPA_BSSID		0x02
+#define IW_SCAN_CAPA_CHANNEL		0x04
+#define IW_SCAN_CAPA_MODE		0x08
+#define IW_SCAN_CAPA_RATE		0x10
+#define IW_SCAN_CAPA_TYPE		0x20
+#define IW_SCAN_CAPA_TIME		0x40
+
 /* Max number of char in custom event - use multiple of them if needed */
 #define IW_CUSTOM_MAX		256	/* In bytes */
 
@@ -988,6 +1004,9 @@ struct	iw_range
 	__u16		old_num_channels;
 	__u8		old_num_frequency;
 
+	/* Scan capabilities */
+	__u8		scan_capa;	/* IW_SCAN_CAPA_* bit field */
+
 	/* Wireless event capability bitmasks */
 	__u32		event_capa[6];
 
@@ -1134,6 +1153,6 @@ struct iw_event
 #define IW_EV_PARAM_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_param))
 #define IW_EV_ADDR_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct sockaddr))
 #define IW_EV_QUAL_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_quality))
-#define IW_EV_POINT_PK_LEN	(IW_EV_LCP_LEN + 4)
+#define IW_EV_POINT_PK_LEN	(IW_EV_LCP_PK_LEN + 4)
 
 #endif	/* _LINUX_WIRELESS_H */