Added all definitions needed for 11n support.
Signed-off-by: Shahar Levi <shahar_levi@xxxxxx>
---
drivers/net/wireless/wl12xx/wl1271.h | 2 +-
drivers/net/wireless/wl12xx/wl1271_acx.h | 91 +++++++++++++++++++++++++++++
drivers/net/wireless/wl12xx/wl1271_conf.h | 3 +
drivers/net/wireless/wl12xx/wl1271_main.c | 13 ++++
4 files changed, 108 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h
index 4134f44..fd1c2fc 100644
--- a/drivers/net/wireless/wl12xx/wl1271.h
+++ b/drivers/net/wireless/wl12xx/wl1271.h
@@ -423,7 +423,7 @@ struct wl1271 {
/* Our association ID */
u16 aid;
- /* currently configured rate set */
+ /* currently configured rate set: bits0-15 BG, bits 16-23 MCS */
u32 sta_rate_set;
u32 basic_rate_set;
u32 basic_rate;
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.h b/drivers/net/wireless/wl12xx/wl1271_acx.h
index 4235bc5..2a8fc43 100644
--- a/drivers/net/wireless/wl12xx/wl1271_acx.h
+++ b/drivers/net/wireless/wl12xx/wl1271_acx.h
@@ -993,6 +993,97 @@ struct wl1271_acx_rssi_snr_avg_weights {
u8 snr_data;
};
+/* 11n command to the FW */
+/* Name: ACX_PEER_HT_CAP
+* Desc: Configure HT capabilities - declare the capabilities of the peer
+* we are connected to.
+* Type: Configuration
+* Access: Write Only
+* Length:
+*/
+struct wl1271_acx_ht_capabilities {
+ struct acx_header header;
+
+ /*
+ * bit 0 - Allow HT Operation
+ * bit 1 - Allow Greenfield format in TX
+ * bit 2 - Allow Short GI in TX
+ * bit 3 - Allow L-SIG TXOP Protection in TX
+ * bit 4 - Allow HT Control fields in TX.
+ * Note, driver will still leave space for HT control in packets
+ * regardless of the value of this field. FW will be responsible to
+ * drop the HT field from any frame when this Bit is set to 0.
+ * 5 - Allow RD initiation in TXOP. FW is allowed to initate RD.
+ * Exact policy setting for this feature is TBD.
+ * Note, this bit can only be set to 1 if bit 3 is set to 1.
+ */
+ u32 ht_capabilites;
+
+ /*
+ * Indicates to which peer these capabilities are relevant.
+ * Note, currently this value will be set to FFFFFFFFFFFF to indicate it
+ * is relevant for all peers since we only support HT in infrastructure
+ * mode. Later on this field will be relevant to IBSS/DLS operation
+ */
+ u8 mac_address[ETH_ALEN];
+
+ /*
+ * This the maximum a-mpdu length supported by the AP. The FW may not
+ * exceed this length when sending A-MPDUs
+ */
+ u8 ampdu_max_length;
+
+ /*
+ * This is the minimal spacing required when sending A-MPDUs to the AP
+ */
+ u8 ampdu_min_spacing;
+} __packed;
+
+/* HT Capabilites Fw Bit Mask Mapping */
+enum acx_ht_capabilites_fw {
+ WL1271_ACX_FW_CAP_BIT_MASK_HT_OPERATION = BIT(0),
+ WL1271_ACX_FW_CAP_BIT_MASK_GREENFIELD_FRAME_FORMAT = BIT(1),
+ WL1271_ACX_FW_CAP_BIT_MASK_SHORT_GI_FOR_20MHZ_PACKETS = BIT(2),
+ WL1271_ACX_FW_CAP_BIT_MASK_LSIG_TXOP_PROTECTION = BIT(3),
+ WL1271_ACX_FW_CAP_BIT_MASK_HT_CONTROL_FIELDS = BIT(4),
+ WL1271_ACX_FW_CAP_BIT_MASK_RD_INITIATION = BIT(5)
+};
+
+/* Name: ACX_HT_BSS_OPERATION
+ * Desc: Configure HT capabilities - AP rules for behavior in the BSS.
+ * Type: Configuration
+ * Access: Write Only
+ * Length:
+ */
+struct wl1271_acx_ht_information {
+ struct acx_header header;
+
+ u8 rifs_mode; /* Values: 0 - RIFS not allowed, 1 - RIFS allowed */
+
+ u8 ht_protection; /* Values: 0 - 3 like in spec */
+
+ /*
+ * Values: 0 - GF protection not required, 1 - GF protection required
+ */
+ u8 gf_protection;
+
+ /*
+ * Values: 0 - TX Burst limit not required, 1 - TX Burst Limit required
+ */
+ u8 ht_tx_burst_limit;
+
+ /*
+ * Values: 0 - Dual CTS protection not required,
+ * 1 Dual CTS Protection required
+ * Note: When this value is set to 1 FW will protect all TXOP with RTS
+ * frame and will not use CTS-to-self regardless of the value of the
+ * ACX_CTS_PROTECTION information element
+ */
+ u8 dual_cts_protection;
+
+ u8 padding[3];
+} __packed;
+
struct wl1271_acx_fw_tsf_information {
struct acx_header header;
diff --git a/drivers/net/wireless/wl12xx/wl1271_conf.h b/drivers/net/wireless/wl12xx/wl1271_conf.h
index 0435ffd..0e22d41 100644
--- a/drivers/net/wireless/wl12xx/wl1271_conf.h
+++ b/drivers/net/wireless/wl12xx/wl1271_conf.h
@@ -91,6 +91,9 @@ enum {
CONF_HW_RXTX_RATE_UNSUPPORTED = 0xff
};
+#define HW_BG_RATES_MASK 0xffff
+#define HW_HT_RATES_OFFSET 16
+
enum {
CONF_SG_DISABLE = 0,
CONF_SG_PROTECTIVE,
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index af26150..ae69397 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -2041,6 +2041,19 @@ static const u8 wl1271_rate_to_idx_2ghz[] = {
0 /* CONF_HW_RXTX_RATE_1 */
};
+/* 11n sta capabilities */
+#define WL12xx_HT_CAP { \
+ .cap = IEEE80211_HT_CAP_GRN_FLD | IEEE80211_HT_CAP_SGI_20, \
+ .ht_supported = true, \
+ .ampdu_factor = IEEE80211_HT_MAX_AMPDU_8K, \
+ .ampdu_density = IEEE80211_HT_MPDU_DENSITY_8, \
+ .mcs = { \
+ .rx_mask = { 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, \
+ .rx_highest = cpu_to_le16(65), \
+ .tx_params = IEEE80211_HT_MCS_TX_DEFINED, \
+ }, \
+}
+
/* can't be const, mac80211 writes to this */
static struct ieee80211_supported_band wl1271_band_2ghz = {
.channels = wl1271_channels,
--
1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
