1 files changed, 3 insertions, 26 deletions

diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h
index 2b938115b26a..6d1c4545eda6 100644
--- a/drivers/net/wireless/mwifiex/fw.h
+++ b/drivers/net/wireless/mwifiex/fw.h
@@ -72,33 +72,12 @@ enum KEY_TYPE_ID {
         KEY_TYPE_ID_AES,
         KEY_TYPE_ID_WAPI,
 };
-
-enum KEY_INFO_WEP {
-        KEY_INFO_WEP_MCAST = 0x01,
-        KEY_INFO_WEP_UNICAST = 0x02,
-        KEY_INFO_WEP_ENABLED = 0x04
-};
-
-enum KEY_INFO_TKIP {
-        KEY_INFO_TKIP_MCAST = 0x01,
-        KEY_INFO_TKIP_UNICAST = 0x02,
-        KEY_INFO_TKIP_ENABLED = 0x04
-};
-
-enum KEY_INFO_AES {
-        KEY_INFO_AES_MCAST = 0x01,
-        KEY_INFO_AES_UNICAST = 0x02,
-        KEY_INFO_AES_ENABLED = 0x04
-};
+#define KEY_MCAST       BIT(0)
+#define KEY_UNICAST     BIT(1)
+#define KEY_ENABLED     BIT(2)
 
 #define WAPI_KEY_LEN                    50
 
-enum KEY_INFO_WAPI {
-        KEY_INFO_WAPI_MCAST = 0x01,
-        KEY_INFO_WAPI_UNICAST = 0x02,
-        KEY_INFO_WAPI_ENABLED = 0x04
-};
-
 #define MAX_POLL_TRIES                  100
 
 #define MAX_MULTI_INTERFACE_POLL_TRIES  1000
@@ -155,7 +134,6 @@ enum MWIFIEX_802_11_WEP_STATUS {
 
 #define MWIFIEX_TX_DATA_BUF_SIZE_4K        4096
 #define MWIFIEX_TX_DATA_BUF_SIZE_8K        8192
-#define NON_GREENFIELD_STAS     0x04
 
 #define ISSUPP_11NENABLED(FwCapInfo) (FwCapInfo & BIT(11))
 
@@ -180,7 +158,6 @@ enum MWIFIEX_802_11_WEP_STATUS {
 #define ISSUPP_GREENFIELD(Dot11nDevCap) (Dot11nDevCap & BIT(29))
 
 #define GET_RXMCSSUPP(DevMCSSupported) (DevMCSSupported & 0x0f)
-#define RESETHT_EXTCAP_RDG(HTExtCap) (HTExtCap &= ~BIT(11))
 #define SETHT_MCS32(x) (x[4] |= 1)
 
 #define SET_SECONDARYCHAN(RadioType, SECCHAN) (RadioType |= (SECCHAN << 4))