mwifiex: make use of IEEE80211_VHT_MCS_NOT_SUPPORTED

Remove driver's macro and use ieee80211's definition instead

Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/mwifiex/11ac.c b/drivers/net/wireless/mwifiex/11ac.c
index 5e0eec4d71c7a5d61e4d65b73ca503aaaf54a085..cc0458c877558e03e1aa3b1c67f7e185d9f9ab33 100644 (file)
--- a/drivers/net/wireless/mwifiex/11ac.c
+++ b/drivers/net/wireless/mwifiex/11ac.c
@@ -126,9 +126,10 @@ mwifiex_fill_vht_cap_tlv(struct mwifiex_private *priv,
                mcs_user = GET_VHTNSSMCS(mcs_map_user, nss);
                mcs_resp = GET_VHTNSSMCS(mcs_map_resp, nss);
 
-               if ((mcs_user == NO_NSS_SUPPORT) ||
-                   (mcs_resp == NO_NSS_SUPPORT))
-                       SET_VHTNSSMCS(mcs_map_result, nss, NO_NSS_SUPPORT);
+               if ((mcs_user == IEEE80211_VHT_MCS_NOT_SUPPORTED) ||
+                   (mcs_resp == IEEE80211_VHT_MCS_NOT_SUPPORTED))
+                       SET_VHTNSSMCS(mcs_map_result, nss,
+                                     IEEE80211_VHT_MCS_NOT_SUPPORTED);
                else
                        SET_VHTNSSMCS(mcs_map_result, nss,
                                      min(mcs_user, mcs_resp));
@@ -147,9 +148,10 @@ mwifiex_fill_vht_cap_tlv(struct mwifiex_private *priv,
        for (nss = 1; nss <= 8; nss++) {
                mcs_user = GET_VHTNSSMCS(mcs_map_user, nss);
                mcs_resp = GET_VHTNSSMCS(mcs_map_resp, nss);
-               if ((mcs_user == NO_NSS_SUPPORT) ||
-                   (mcs_resp == NO_NSS_SUPPORT))
-                       SET_VHTNSSMCS(mcs_map_result, nss, NO_NSS_SUPPORT);
+               if ((mcs_user == IEEE80211_VHT_MCS_NOT_SUPPORTED) ||
+                   (mcs_resp == IEEE80211_VHT_MCS_NOT_SUPPORTED))
+                       SET_VHTNSSMCS(mcs_map_result, nss,
+                                     IEEE80211_VHT_MCS_NOT_SUPPORTED);
                else
                        SET_VHTNSSMCS(mcs_map_result, nss,
                                      min(mcs_user, mcs_resp));

diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h
index 5fa932d5f905531ba17c3e93375eecd0fbca6f70..059bc16adf81b3e8d10948882e574cd2fa0da084 100644 (file)
--- a/drivers/net/wireless/mwifiex/fw.h
+++ b/drivers/net/wireless/mwifiex/fw.h
@@ -232,8 +232,6 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 #define GET_VHTNSSMCS(mcs_mapset, nss) ((mcs_mapset >> (2 * (nss - 1))) & 0x3)
 #define SET_VHTNSSMCS(mcs_mapset, nss, value) (mcs_mapset |= (value & 0x3) << \
                                              (2 * (nss - 1)))
-#define NO_NSS_SUPPORT         0x3
-
 #define GET_DEVTXMCSMAP(dev_mcs_map)      (dev_mcs_map >> 16)
 #define GET_DEVRXMCSMAP(dev_mcs_map)      (dev_mcs_map & 0xFFFF)