Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7abf4129 authored by Bing Zhao's avatar Bing Zhao Committed by John W. Linville
Browse files

mwifiex: make use of IEEE80211_VHT_MCS_NOT_SUPPORTED 



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

Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e3d7556b

drivers/net/wireless/mwifiex/11ac.c

+8 −6
Original line number Diff line number Diff line
@@ -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));

drivers/net/wireless/mwifiex/fw.h

+0 −2
Original line number Diff line number Diff line
@@ -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)