fw/nsc-linux-2.6.29: comparison include/linux/ieee80211.h

equal deleted inserted replaced

-:0056487c491e
+:d1f6d8b6f81c
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 */
-#ifndef IEEE80211_H
+#ifndef LINUX_IEEE80211_H
-#define IEEE80211_H
+#define LINUX_IEEE80211_H
 #include <linux/types.h>
 #include <asm/byteorder.h>
 #define FCS_LEN 4
 #define IEEE80211_MAX_DATA_LEN		2304
 /* 30 byte 4 addr hdr, 2 byte QoS, 2304 byte MSDU, 12 byte crypt, 4 byte FCS */
 #define IEEE80211_MAX_FRAME_LEN		2352
 #define IEEE80211_MAX_SSID_LEN		32
 #define IEEE80211_MAX_MESH_ID_LEN	32
+#define IEEE80211_MESH_CONFIG_LEN	19
 #define IEEE80211_QOS_CTL_LEN		2
 #define IEEE80211_QOS_CTL_TID_MASK	0x000F
 #define IEEE80211_QOS_CTL_TAG1D_MASK	0x0007
 struct ieee80211_hdr {
 	__le16 frame_control;
 	__le16 duration;
 	u8 ra[6];
 } __attribute__ ((packed));
+struct ieee80211_pspoll {
+	__le16 frame_control;
+	__le16 aid;
+	u8 bssid[6];
+	u8 ta[6];
+} __attribute__ ((packed));
 /**
 * struct ieee80211_bar - HT Block Ack Request
 *
 * This structure refers to "HT BlockAckReq" as
 * described in 802.11n draft section 7.2.1.7.1
 /* 802.11 BAR control masks */
 #define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL     0x0000
 #define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA  0x0004
+#define IEEE80211_HT_MCS_MASK_LEN		10
+/**
+* struct ieee80211_mcs_info - MCS information
+* @rx_mask: RX mask
+* @rx_highest: highest supported RX rate
+* @tx_params: TX parameters
+*/
+struct ieee80211_mcs_info {
+	u8 rx_mask[IEEE80211_HT_MCS_MASK_LEN];
+	__le16 rx_highest;
+	u8 tx_params;
+	u8 reserved[3];
+} __attribute__((packed));
+/* 802.11n HT capability MSC set */
+#define IEEE80211_HT_MCS_RX_HIGHEST_MASK	0x3ff
+#define IEEE80211_HT_MCS_TX_DEFINED		0x01
+#define IEEE80211_HT_MCS_TX_RX_DIFF		0x02
+/* value 0 == 1 stream etc */
+#define IEEE80211_HT_MCS_TX_MAX_STREAMS_MASK	0x0C
+#define IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT	2
+#define		IEEE80211_HT_MCS_TX_MAX_STREAMS	4
+#define IEEE80211_HT_MCS_TX_UNEQUAL_MODULATION	0x10
+/*
+* 802.11n D5.0 20.3.5 / 20.6 says:
+* - indices 0 to 7 and 32 are single spatial stream
+* - 8 to 31 are multiple spatial streams using equal modulation
+*   [8..15 for two streams, 16..23 for three and 24..31 for four]
+* - remainder are multiple spatial streams using unequal modulation
+*/
+#define IEEE80211_HT_MCS_UNEQUAL_MODULATION_START 33
+#define IEEE80211_HT_MCS_UNEQUAL_MODULATION_START_BYTE \
+	(IEEE80211_HT_MCS_UNEQUAL_MODULATION_START / 8)
 /**
 * struct ieee80211_ht_cap - HT capabilities
 *
-* This structure refers to "HT capabilities element" as
+* This structure is the "HT capabilities element" as
-* described in 802.11n draft section 7.3.2.52
+* described in 802.11n D5.0 7.3.2.57
 */
 struct ieee80211_ht_cap {
 	__le16 cap_info;
 	u8 ampdu_params_info;
-	u8 supp_mcs_set[16];
+	/* 16 bytes MCS information */
+	struct ieee80211_mcs_info mcs;
 	__le16 extended_ht_cap_info;
 	__le32 tx_BF_cap_info;
 	u8 antenna_selection_info;
 } __attribute__ ((packed));
-/**
+/* 802.11n HT capabilities masks (for cap_info) */
-* struct ieee80211_ht_cap - HT additional information
+#define IEEE80211_HT_CAP_LDPC_CODING		0x0001
-*
+#define IEEE80211_HT_CAP_SUP_WIDTH_20_40	0x0002
-* This structure refers to "HT information element" as
+#define IEEE80211_HT_CAP_SM_PS			0x000C
-* described in 802.11n draft section 7.3.2.53
+#define IEEE80211_HT_CAP_GRN_FLD		0x0010
-*/
+#define IEEE80211_HT_CAP_SGI_20			0x0020
-struct ieee80211_ht_addt_info {
+#define IEEE80211_HT_CAP_SGI_40			0x0040
+#define IEEE80211_HT_CAP_TX_STBC		0x0080
+#define IEEE80211_HT_CAP_RX_STBC		0x0300
+#define IEEE80211_HT_CAP_DELAY_BA		0x0400
+#define IEEE80211_HT_CAP_MAX_AMSDU		0x0800
+#define IEEE80211_HT_CAP_DSSSCCK40		0x1000
+#define IEEE80211_HT_CAP_PSMP_SUPPORT		0x2000
+#define IEEE80211_HT_CAP_40MHZ_INTOLERANT	0x4000
+#define IEEE80211_HT_CAP_LSIG_TXOP_PROT		0x8000
+/* 802.11n HT capability AMPDU settings (for ampdu_params_info) */
+#define IEEE80211_HT_AMPDU_PARM_FACTOR		0x03
+#define IEEE80211_HT_AMPDU_PARM_DENSITY		0x1C
+/**
+* struct ieee80211_ht_info - HT information
+*
+* This structure is the "HT information element" as
+* described in 802.11n D5.0 7.3.2.58
+*/
+struct ieee80211_ht_info {
 	u8 control_chan;
 	u8 ht_param;
 	__le16 operation_mode;
 	__le16 stbc_param;
 	u8 basic_set[16];
 } __attribute__ ((packed));
-/* 802.11n HT capabilities masks */
+/* for ht_param */
-#define IEEE80211_HT_CAP_SUP_WIDTH		0x0002
+#define IEEE80211_HT_PARAM_CHA_SEC_OFFSET		0x03
-#define IEEE80211_HT_CAP_SM_PS			0x000C
+#define		IEEE80211_HT_PARAM_CHA_SEC_NONE		0x00
-#define IEEE80211_HT_CAP_GRN_FLD		0x0010
+#define		IEEE80211_HT_PARAM_CHA_SEC_ABOVE	0x01
-#define IEEE80211_HT_CAP_SGI_20			0x0020
+#define		IEEE80211_HT_PARAM_CHA_SEC_BELOW	0x03
-#define IEEE80211_HT_CAP_SGI_40			0x0040
+#define IEEE80211_HT_PARAM_CHAN_WIDTH_ANY		0x04
-#define IEEE80211_HT_CAP_DELAY_BA		0x0400
+#define IEEE80211_HT_PARAM_RIFS_MODE			0x08
-#define IEEE80211_HT_CAP_MAX_AMSDU		0x0800
+#define IEEE80211_HT_PARAM_SPSMP_SUPPORT		0x10
-#define IEEE80211_HT_CAP_DSSSCCK40		0x1000
+#define IEEE80211_HT_PARAM_SERV_INTERVAL_GRAN		0xE0
-/* 802.11n HT capability AMPDU settings */
-#define IEEE80211_HT_CAP_AMPDU_FACTOR		0x03
+/* for operation_mode */
-#define IEEE80211_HT_CAP_AMPDU_DENSITY		0x1C
+#define IEEE80211_HT_OP_MODE_PROTECTION			0x0003
-/* 802.11n HT capability MSC set */
+#define		IEEE80211_HT_OP_MODE_PROTECTION_NONE		0
-#define IEEE80211_SUPP_MCS_SET_UEQM		4
+#define		IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER	1
-#define IEEE80211_HT_CAP_MAX_STREAMS		4
+#define		IEEE80211_HT_OP_MODE_PROTECTION_20MHZ		2
-#define IEEE80211_SUPP_MCS_SET_LEN		10
+#define		IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED	3
-/* maximum streams the spec allows */
+#define IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT		0x0004
-#define IEEE80211_HT_CAP_MCS_TX_DEFINED		0x01
+#define IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT		0x0010
-#define IEEE80211_HT_CAP_MCS_TX_RX_DIFF		0x02
-#define IEEE80211_HT_CAP_MCS_TX_STREAMS		0x0C
+/* for stbc_param */
-#define IEEE80211_HT_CAP_MCS_TX_UEQM		0x10
+#define IEEE80211_HT_STBC_PARAM_DUAL_BEACON		0x0040
-/* 802.11n HT IE masks */
+#define IEEE80211_HT_STBC_PARAM_DUAL_CTS_PROT		0x0080
-#define IEEE80211_HT_IE_CHA_SEC_OFFSET		0x03
+#define IEEE80211_HT_STBC_PARAM_STBC_BEACON		0x0100
-#define IEEE80211_HT_IE_CHA_SEC_NONE	 	0x00
+#define IEEE80211_HT_STBC_PARAM_LSIG_TXOP_FULLPROT	0x0200
-#define IEEE80211_HT_IE_CHA_SEC_ABOVE 		0x01
+#define IEEE80211_HT_STBC_PARAM_PCO_ACTIVE		0x0400
-#define IEEE80211_HT_IE_CHA_SEC_BELOW 		0x03
+#define IEEE80211_HT_STBC_PARAM_PCO_PHASE		0x0800
-#define IEEE80211_HT_IE_CHA_WIDTH		0x04
-#define IEEE80211_HT_IE_HT_PROTECTION		0x0003
-#define IEEE80211_HT_IE_NON_GF_STA_PRSNT	0x0004
-#define IEEE80211_HT_IE_NON_HT_STA_PRSNT	0x0010
 /* block-ack parameters */
 #define IEEE80211_ADDBA_PARAM_POLICY_MASK 0x0002
 #define IEEE80211_ADDBA_PARAM_TID_MASK 0x003C
 #define IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFA0
 #define WLAN_HT_CAP_SM_PS_DISABLED	3
 /* Authentication algorithms */
 #define WLAN_AUTH_OPEN 0
 #define WLAN_AUTH_SHARED_KEY 1
-#define WLAN_AUTH_FAST_BSS_TRANSITION 2
 #define WLAN_AUTH_LEAP 128
 #define WLAN_AUTH_CHALLENGE_LEN 128
 #define WLAN_CAPABILITY_ESS		(1<<0)
 	/* 802.11g */
 	WLAN_EID_ERP_INFO = 42,
 	WLAN_EID_EXT_SUPP_RATES = 50,
 	/* 802.11n */
 	WLAN_EID_HT_CAPABILITY = 45,
-	WLAN_EID_HT_EXTRA_INFO = 61,
+	WLAN_EID_HT_INFORMATION = 61,
 	/* 802.11i */
 	WLAN_EID_RSN = 48,
 	WLAN_EID_WPA = 221,
 	WLAN_EID_GENERIC = 221,
 	WLAN_EID_VENDOR_SPECIFIC = 221,
 	WLAN_ACTION_SPCT_TPC_REQ = 2,
 	WLAN_ACTION_SPCT_TPC_RPRT = 3,
 	WLAN_ACTION_SPCT_CHL_SWITCH = 4,
 };
+/*
+* IEEE 802.11-2007 7.3.2.9 Country information element
+*
+* Minimum length is 8 octets, ie len must be evenly
+* divisible by 2
+*/
+/* Although the spec says 8 I'm seeing 6 in practice */
+#define IEEE80211_COUNTRY_IE_MIN_LEN	6
+/*
+* For regulatory extension stuff see IEEE 802.11-2007
+* Annex I (page 1141) and Annex J (page 1147). Also
+* review 7.3.2.9.
+*
+* When dot11RegulatoryClassesRequired is true and the
+* first_channel/reg_extension_id is >= 201 then the IE
+* compromises of the 'ext' struct represented below:
+*
+*  - Regulatory extension ID - when generating IE this just needs
+*    to be monotonically increasing for each triplet passed in
+*    the IE
+*  - Regulatory class - index into set of rules
+*  - Coverage class - index into air propagation time (Table 7-27),
+*    in microseconds, you can compute the air propagation time from
+*    the index by multiplying by 3, so index 10 yields a propagation
+*    of 10 us. Valid values are 0-31, values 32-255 are not defined
+*    yet. A value of 0 inicates air propagation of <= 1 us.
+*
+*  See also Table I.2 for Emission limit sets and table
+*  I.3 for Behavior limit sets. Table J.1 indicates how to map
+*  a reg_class to an emission limit set and behavior limit set.
+*/
+#define IEEE80211_COUNTRY_EXTENSION_ID 201
+/*
+*  Channels numbers in the IE must be monotonically increasing
+*  if dot11RegulatoryClassesRequired is not true.
+*
+*  If dot11RegulatoryClassesRequired is true consecutive
+*  subband triplets following a regulatory triplet shall
+*  have monotonically increasing first_channel number fields.
+*
+*  Channel numbers shall not overlap.
+*
+*  Note that max_power is signed.
+*/
+struct ieee80211_country_ie_triplet {
+	union {
+		struct {
+			u8 first_channel;
+			u8 num_channels;
+			s8 max_power;
+		} __attribute__ ((packed)) chans;
+		struct {
+			u8 reg_extension_id;
+			u8 reg_class;
+			u8 coverage_class;
+		} __attribute__ ((packed)) ext;
+	};
+} __attribute__ ((packed));
 /* BACK action code */
 enum ieee80211_back_actioncode {
 	WLAN_ACTION_ADDBA_REQ = 0,
 	WLAN_ACTION_ADDBA_RESP = 1,
 	WLAN_ACTION_DELBA = 2,
 		return hdr->addr3;
 	else
 		return hdr->addr1;
 }
-#endif /* IEEE80211_H */
+#endif /* LINUX_IEEE80211_H */

changeset 2	d1f6d8b6f81c
parent 0	aa628870c1d3