mwifiex: get supported BA stream info from FW

This patch adds support to get number of BA streams
supported information from FW. Some newer chips(e.g. 8897 series)
support 4 BA streams for TX; so driver should not disallow BA stream
setup just after 2 streams have been established.

Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/mwifiex/11n.h b/drivers/net/wireless/mwifiex/11n.h
index f275675cdbd3b331846c7f05528acf4d6909932d..8e2e39422ad80edaa303c7a5877651d3ceb92a9f 100644 (file)
--- a/drivers/net/wireless/mwifiex/11n.h
+++ b/drivers/net/wireless/mwifiex/11n.h
@@ -130,7 +130,9 @@ static inline u8 mwifiex_space_avail_for_new_ba_stream(
 {
        struct mwifiex_private *priv;
        u8 i;
-       u32 ba_stream_num = 0;
+       u32 ba_stream_num = 0, ba_stream_max;
+
+       ba_stream_max = MWIFIEX_MAX_TX_BASTREAM_SUPPORTED;
 
        for (i = 0; i < adapter->priv_num; i++) {
                priv = adapter->priv[i];
@@ -139,8 +141,14 @@ static inline u8 mwifiex_space_avail_for_new_ba_stream(
                                &priv->tx_ba_stream_tbl_ptr);
        }
 
-       return ((ba_stream_num <
-                MWIFIEX_MAX_TX_BASTREAM_SUPPORTED) ? true : false);
+       if (adapter->fw_api_ver == MWIFIEX_FW_V15) {
+               ba_stream_max =
+                              GETSUPP_TXBASTREAMS(adapter->hw_dot_11n_dev_cap);
+               if (!ba_stream_max)
+                       ba_stream_max = MWIFIEX_MAX_TX_BASTREAM_SUPPORTED;
+       }
+
+       return ((ba_stream_num < ba_stream_max) ? true : false);
 }
 
 /*

diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h
index a1b8d5319562bb79a59753ade1258a61b526fa5a..15ad776ae08ec721488996bf4e6f386e5ffe471f 100644 (file)
--- a/drivers/net/wireless/mwifiex/fw.h
+++ b/drivers/net/wireless/mwifiex/fw.h
@@ -233,6 +233,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 #define ISSUPP_RXLDPC(Dot11nDevCap) (Dot11nDevCap & BIT(22))
 #define ISSUPP_BEAMFORMING(Dot11nDevCap) (Dot11nDevCap & BIT(30))
 #define ISALLOWED_CHANWIDTH40(ht_param) (ht_param & BIT(2))
+#define GETSUPP_TXBASTREAMS(Dot11nDevCap) ((Dot11nDevCap >> 18) & 0xF)
 
 /* httxcfg bitmap
  * 0           reserved