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

Commit 4b9fede5 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville
Browse files

mwifiex: rename macro and variables related to API revision 



We will remove 'fw' prefix from these variable and macro
names and make them generic.

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarCathy Luo <cluo@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2618d4fb

drivers/net/wireless/mwifiex/cmdevt.c

+9 −9
Original line number Diff line number Diff line
@@ -1470,7 +1470,7 @@ int mwifiex_ret_get_hw_spec(struct mwifiex_private *priv, 
	struct host_cmd_ds_get_hw_spec *hw_spec = &resp->params.hw_spec;

	struct mwifiex_adapter *adapter = priv->adapter;

	struct mwifiex_ie_types_header *tlv;

	struct hw_spec_fw_api_rev *api_rev;

	struct hw_spec_api_rev *api_rev;

	u16 resp_size, api_id;

	int i, left_len, parsed_len = 0;
@@ -1538,23 +1538,23 @@ int mwifiex_ret_get_hw_spec(struct mwifiex_private *priv, 
		while (left_len > sizeof(struct mwifiex_ie_types_header)) {

			tlv = (void *)&hw_spec->tlvs + parsed_len;

			switch (le16_to_cpu(tlv->type)) {

			case TLV_TYPE_FW_API_REV:

				api_rev = (struct hw_spec_fw_api_rev *)tlv;

			case TLV_TYPE_API_REV:

				api_rev = (struct hw_spec_api_rev *)tlv;

				api_id = le16_to_cpu(api_rev->api_id);

				switch (api_id) {

				case KEY_API_VER_ID:

					adapter->fw_key_api_major_ver =

					adapter->key_api_major_ver =

							api_rev->major_ver;

					adapter->fw_key_api_minor_ver =

					adapter->key_api_minor_ver =

							api_rev->minor_ver;

					dev_dbg(adapter->dev,

						"fw_key_api v%d.%d\n",

						adapter->fw_key_api_major_ver,

						adapter->fw_key_api_minor_ver);

						"key_api v%d.%d\n",

						adapter->key_api_major_ver,

						adapter->key_api_minor_ver);

					break;

				default:

					dev_warn(adapter->dev,

						 "Unknown FW api_id: %d\n",

						 "Unknown api_id: %d\n",

						 api_id);

					break;

				}

drivers/net/wireless/mwifiex/fw.h

+4 −4
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ enum KEY_TYPE_ID { 
#define WPA_PN_SIZE		8

#define KEY_PARAMS_FIXED_LEN	10

#define KEY_INDEX_MASK		0xf

#define FW_KEY_API_VER_MAJOR_V2	2

#define KEY_API_VER_MAJOR_V2	2



#define KEY_MCAST	BIT(0)

#define KEY_UNICAST	BIT(1)
@@ -170,7 +170,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER { 
#define TLV_TYPE_COALESCE_RULE      (PROPRIETARY_TLV_BASE_ID + 154)

#define TLV_TYPE_KEY_PARAM_V2       (PROPRIETARY_TLV_BASE_ID + 156)

#define TLV_TYPE_TDLS_IDLE_TIMEOUT  (PROPRIETARY_TLV_BASE_ID + 194)

#define TLV_TYPE_FW_API_REV         (PROPRIETARY_TLV_BASE_ID + 199)

#define TLV_TYPE_API_REV	    (PROPRIETARY_TLV_BASE_ID + 199)



#define MWIFIEX_TX_DATA_BUF_SIZE_2K        2048
@@ -844,11 +844,11 @@ struct host_cmd_ds_802_11_ps_mode_enh { 
	} params;

} __packed;



enum FW_API_VER_ID {

enum API_VER_ID {

	KEY_API_VER_ID = 1,

};



struct hw_spec_fw_api_rev {

struct hw_spec_api_rev {

	struct mwifiex_ie_types_header header;

	__le16 api_id;

	u8 major_ver;

drivers/net/wireless/mwifiex/init.c

+2 −2
Original line number Diff line number Diff line
@@ -282,8 +282,8 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter) 
	adapter->max_mgmt_ie_index = MAX_MGMT_IE_INDEX;

	adapter->empty_tx_q_cnt = 0;

	adapter->ext_scan = true;

	adapter->fw_key_api_major_ver = 0;

	adapter->fw_key_api_minor_ver = 0;

	adapter->key_api_major_ver = 0;

	adapter->key_api_minor_ver = 0;

}



/*

drivers/net/wireless/mwifiex/main.h

+1 −1
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ struct mwifiex_adapter { 
	struct semaphore *card_sem;

	bool ext_scan;

	u8 fw_api_ver;

	u8 fw_key_api_major_ver, fw_key_api_minor_ver;

	u8 key_api_major_ver, key_api_minor_ver;

	struct work_struct iface_work;

	unsigned long iface_work_flags;

	struct memory_type_mapping *mem_type_mapping_tbl;

drivers/net/wireless/mwifiex/sta_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -965,7 +965,7 @@ mwifiex_cmd_802_11_key_material(struct mwifiex_private *priv, 
				u16 cmd_action, u32 cmd_oid,

				struct mwifiex_ds_encrypt_key *enc_key)

{

	if (priv->adapter->fw_key_api_major_ver == FW_KEY_API_VER_MAJOR_V2)

	if (priv->adapter->key_api_major_ver == KEY_API_VER_MAJOR_V2)

		return mwifiex_cmd_802_11_key_material_v2(priv, cmd,

							  cmd_action, cmd_oid,

							  enc_key);