802.11: clean up/fix HT support

This patch cleans up a number of things:
 * the unusable definition of the HT capabilities/HT information
   information elements
 * variable names that are hard to understand
 * mac80211: move ieee80211_handle_ht to ht.c and remove the unused
             enable_ht parameter
 * mac80211: fix bug with MCS rate 32 in ieee80211_handle_ht
 * mac80211: fix bug with casting the result of ieee80211_bss_get_ie
             to an information element _contents_ rather than the
             whole element, add size checking (another out-of-bounds
             access bug fixed!)
 * mac80211: remove some unused return values in favour of BUG_ON
             checking
 * a few minor other things

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 109 insertions, 51 deletions

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 14126bc36641..64a4abce6d91 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -685,28 +685,88 @@ struct ieee80211_bar {
 #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
- * described in 802.11n draft section 7.3.2.52
+ * This structure is the "HT capabilities element" as
+ * 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) */
+#define IEEE80211_HT_CAP_LDPC_CODING            0x0001
+#define IEEE80211_HT_CAP_SUP_WIDTH_20_40        0x0002
+#define IEEE80211_HT_CAP_SM_PS                  0x000C
+#define IEEE80211_HT_CAP_GRN_FLD                0x0010
+#define IEEE80211_HT_CAP_SGI_20                 0x0020
+#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_cap - HT additional information
+ * struct ieee80211_ht_info - HT information
  *
- * This structure refers to "HT information element" as
- * described in 802.11n draft section 7.3.2.53
+ * This structure is the "HT information element" as
+ * described in 802.11n D5.0 7.3.2.58
  */
-struct ieee80211_ht_addt_info {
+struct ieee80211_ht_info {
         u8 control_chan;
         u8 ht_param;
         __le16 operation_mode;
@@ -714,36 +774,33 @@ struct ieee80211_ht_addt_info {
         u8 basic_set[16];
 } __attribute__ ((packed));
 
-/* 802.11n HT capabilities masks */
-#define IEEE80211_HT_CAP_SUP_WIDTH              0x0002
-#define IEEE80211_HT_CAP_SM_PS                  0x000C
-#define IEEE80211_HT_CAP_GRN_FLD                0x0010
-#define IEEE80211_HT_CAP_SGI_20                 0x0020
-#define IEEE80211_HT_CAP_SGI_40                 0x0040
-#define IEEE80211_HT_CAP_DELAY_BA               0x0400
-#define IEEE80211_HT_CAP_MAX_AMSDU              0x0800
-#define IEEE80211_HT_CAP_DSSSCCK40              0x1000
-/* 802.11n HT capability AMPDU settings */
-#define IEEE80211_HT_CAP_AMPDU_FACTOR           0x03
-#define IEEE80211_HT_CAP_AMPDU_DENSITY          0x1C
-/* 802.11n HT capability MSC set */
-#define IEEE80211_SUPP_MCS_SET_UEQM             4
-#define IEEE80211_HT_CAP_MAX_STREAMS            4
-#define IEEE80211_SUPP_MCS_SET_LEN              10
-/* maximum streams the spec allows */
-#define IEEE80211_HT_CAP_MCS_TX_DEFINED         0x01
-#define IEEE80211_HT_CAP_MCS_TX_RX_DIFF         0x02
-#define IEEE80211_HT_CAP_MCS_TX_STREAMS         0x0C
-#define IEEE80211_HT_CAP_MCS_TX_UEQM            0x10
-/* 802.11n HT IE masks */
-#define IEEE80211_HT_IE_CHA_SEC_OFFSET          0x03
-#define IEEE80211_HT_IE_CHA_SEC_NONE            0x00
-#define IEEE80211_HT_IE_CHA_SEC_ABOVE           0x01
-#define IEEE80211_HT_IE_CHA_SEC_BELOW           0x03
-#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
+/* for ht_param */
+#define IEEE80211_HT_PARAM_CHA_SEC_OFFSET               0x03
+#define         IEEE80211_HT_PARAM_CHA_SEC_NONE         0x00
+#define         IEEE80211_HT_PARAM_CHA_SEC_ABOVE        0x01
+#define         IEEE80211_HT_PARAM_CHA_SEC_BELOW        0x03
+#define IEEE80211_HT_PARAM_CHAN_WIDTH_ANY               0x04
+#define IEEE80211_HT_PARAM_RIFS_MODE                    0x08
+#define IEEE80211_HT_PARAM_SPSMP_SUPPORT                0x10
+#define IEEE80211_HT_PARAM_SERV_INTERVAL_GRAN           0xE0
+
+/* for operation_mode */
+#define IEEE80211_HT_OP_MODE_PROTECTION                 0x0003
+#define         IEEE80211_HT_OP_MODE_PROTECTION_NONE            0
+#define         IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER       1
+#define         IEEE80211_HT_OP_MODE_PROTECTION_20MHZ           2
+#define         IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED     3
+#define IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT           0x0004
+#define IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT           0x0010
+
+/* for stbc_param */
+#define IEEE80211_HT_STBC_PARAM_DUAL_BEACON             0x0040
+#define IEEE80211_HT_STBC_PARAM_DUAL_CTS_PROT           0x0080
+#define IEEE80211_HT_STBC_PARAM_STBC_BEACON             0x0100
+#define IEEE80211_HT_STBC_PARAM_LSIG_TXOP_FULLPROT      0x0200
+#define IEEE80211_HT_STBC_PARAM_PCO_ACTIVE              0x0400
+#define IEEE80211_HT_STBC_PARAM_PCO_PHASE               0x0800
+
 
 /* block-ack parameters */
 #define IEEE80211_ADDBA_PARAM_POLICY_MASK 0x0002
@@ -949,7 +1006,7 @@ enum ieee80211_eid {
         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,
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index d1466e7a47b8..2870f3973f1a 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -191,7 +191,7 @@ enum ieee80211_bss_change {
  * @beacon_int: beacon interval
  * @assoc_capability: capabilities taken from assoc resp
  * @assoc_ht: association in HT mode
- * @ht_conf: ht capabilities
+ * @ht_cap: ht capabilities
  * @ht_bss_conf: ht extended capabilities
  * @basic_rates: bitmap of basic rates, each bit stands for an
  *      index into the rate table configured by the driver in
@@ -212,7 +212,7 @@ struct ieee80211_bss_conf {
         u64 basic_rates;
         /* ht related data */
         bool assoc_ht;
-        struct ieee80211_ht_info *ht_conf;
+        struct ieee80211_sta_ht_cap *ht_cap;
         struct ieee80211_ht_bss_info *ht_bss_conf;
 };
 
@@ -477,7 +477,7 @@ static inline int __deprecated __IEEE80211_CONF_SHORT_SLOT_TIME(void)
  * @antenna_sel_tx: transmit antenna selection, 0: default/diversity,
  *      1/2: antenna 0/1
  * @antenna_sel_rx: receive antenna selection, like @antenna_sel_tx
- * @ht_conf: describes current self configuration of 802.11n HT capabilies
+ * @ht_cap: describes current self configuration of 802.11n HT capabilities
  * @ht_bss_conf: describes current BSS configuration of 802.11n HT parameters
  * @channel: the channel to tune to
  */
@@ -493,7 +493,7 @@ struct ieee80211_conf {
 
         struct ieee80211_channel *channel;
 
-        struct ieee80211_ht_info ht_conf;
+        struct ieee80211_sta_ht_cap ht_cap;
         struct ieee80211_ht_bss_info ht_bss_conf;
 };
 
@@ -687,7 +687,7 @@ enum set_key_cmd {
  * @addr: MAC address
  * @aid: AID we assigned to the station if we're an AP
  * @supp_rates: Bitmap of supported rates (per band)
- * @ht_info: HT capabilities of this STA
+ * @ht_cap: HT capabilities of this STA
  * @drv_priv: data area for driver use, will always be aligned to
  *      sizeof(void *), size is determined in hw information.
  */
@@ -695,7 +695,7 @@ struct ieee80211_sta {
         u64 supp_rates[IEEE80211_NUM_BANDS];
         u8 addr[ETH_ALEN];
         u16 aid;
-        struct ieee80211_ht_info ht_info;
+        struct ieee80211_sta_ht_cap ht_cap;
 
         /* must be last */
         u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
diff --git a/include/net/wireless.h b/include/net/wireless.h
index 721efb363db7..c0aa0fb8db5e 100644
--- a/include/net/wireless.h
+++ b/include/net/wireless.h
@@ -10,6 +10,7 @@
 #include <linux/netdevice.h>
 #include <linux/debugfs.h>
 #include <linux/list.h>
+#include <linux/ieee80211.h>
 #include <net/cfg80211.h>
 
 /**
@@ -133,23 +134,23 @@ struct ieee80211_rate {
 };
 
 /**
- * struct ieee80211_ht_info - describing STA's HT capabilities
+ * struct ieee80211_sta_ht_cap - STA's HT capabilities
  *
  * This structure describes most essential parameters needed
  * to describe 802.11n HT capabilities for an STA.
  *
- * @ht_supported: is HT supported by STA, 0: no, 1: yes
+ * @ht_supported: is HT supported by the STA
  * @cap: HT capabilities map as described in 802.11n spec
  * @ampdu_factor: Maximum A-MPDU length factor
  * @ampdu_density: Minimum A-MPDU spacing
- * @supp_mcs_set: Supported MCS set as described in 802.11n spec
+ * @mcs: Supported MCS rates
  */
-struct ieee80211_ht_info {
+struct ieee80211_sta_ht_cap {
         u16 cap; /* use IEEE80211_HT_CAP_ */
-        u8 ht_supported;
+        bool ht_supported;
         u8 ampdu_factor;
         u8 ampdu_density;
-        u8 supp_mcs_set[16];
+        struct ieee80211_mcs_info mcs;
 };
 
 /**
@@ -173,7 +174,7 @@ struct ieee80211_supported_band {
         enum ieee80211_band band;
         int n_channels;
         int n_bitrates;
-        struct ieee80211_ht_info ht_info;
+        struct ieee80211_sta_ht_cap ht_cap;
 };
 
 /**