mwifiex: add custom IE framework (ede98bfa) · Commits · 戴 / test

drivers/net/wireless/mwifiex/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ mwifiex-y += join.o
		mwifiex-y += sta_ioctl.o
		mwifiex-y += sta_cmd.o
		mwifiex-y += uap_cmd.o
		mwifiex-y += ie.o
		mwifiex-y += sta_cmdresp.o
		mwifiex-y += sta_event.o
		mwifiex-y += sta_tx.o

drivers/net/wireless/mwifiex/fw.h

+17 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,9 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
		#define CAL_SNR(RSSI, NF) ((s16)((s16)(RSSI)-(s16)(NF)))

		#define UAP_BSS_PARAMS_I 0
		#define UAP_CUSTOM_IE_I 1
		#define MWIFIEX_AUTO_IDX_MASK 0xffff
		#define MWIFIEX_DELETE_MASK 0x0000

		#define TLV_TYPE_UAP_SSID 0x0000

		@@ -1299,6 +1302,20 @@ struct host_cmd_ds_802_11_subsc_evt {
		__le16 events;
		} __packed;

		struct mwifiex_ie {
		__le16 ie_index;
		__le16 mgmt_subtype_mask;
		__le16 ie_length;
		u8 ie_buffer[IEEE_MAX_IE_SIZE];
		} __packed;

		#define MAX_MGMT_IE_INDEX 16
		struct mwifiex_ie_list {
		__le16 type;
		__le16 len;
		struct mwifiex_ie ie_list[MAX_MGMT_IE_INDEX];
		} __packed;

		struct host_cmd_ds_command {
		__le16 command;
		__le16 size;

drivers/net/wireless/mwifiex/ie.c

0 → 100644

+149 −0

Original line number	Diff line number	Diff line
		/*
		* Marvell Wireless LAN device driver: management IE handling- setting and
		* deleting IE.
		*
		* Copyright (C) 2012, Marvell International Ltd.
		*
		* This software file (the "File") is distributed by Marvell International
		* Ltd. under the terms of the GNU General Public License Version 2, June 1991
		* (the "License"). You may use, redistribute and/or modify this File in
		* accordance with the terms and conditions of the License, a copy of which
		* is available by writing to the Free Software Foundation, Inc.,
		* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
		* worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
		*
		* THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
		* IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
		* ARE EXPRESSLY DISCLAIMED. The License provides additional details about
		* this warranty disclaimer.
		*/

		#include "main.h"

		/* This function checks if current IE index is used by any on other interface.
		* Return: -1: yes, current IE index is used by someone else.
		* 0: no, current IE index is NOT used by other interface.
		*/
		static int
		mwifiex_ie_index_used_by_other_intf(struct mwifiex_private *priv, u16 idx)
		{
		int i;
		struct mwifiex_adapter *adapter = priv->adapter;
		struct mwifiex_ie *ie;

		for (i = 0; i < adapter->priv_num; i++) {
		if (adapter->priv[i] != priv) {
		ie = &adapter->priv[i]->mgmt_ie[idx];
		if (ie->mgmt_subtype_mask && ie->ie_length)
		return -1;
		}
		}

		return 0;
		}

		/* Get unused IE index. This index will be used for setting new IE */
		static int
		mwifiex_ie_get_autoidx(struct mwifiex_private *priv, u16 subtype_mask,
		struct mwifiex_ie ie, u16 index)
		{
		u16 mask, len, i;

		for (i = 0; i < priv->adapter->max_mgmt_ie_index; i++) {
		mask = le16_to_cpu(priv->mgmt_ie[i].mgmt_subtype_mask);
		len = le16_to_cpu(priv->mgmt_ie[i].ie_length) +
		le16_to_cpu(ie->ie_length);

		if (mask == MWIFIEX_AUTO_IDX_MASK)
		continue;

		if (mask == subtype_mask) {
		if (len > IEEE_MAX_IE_SIZE)
		continue;

		*index = i;
		return 0;
		}

		if (!priv->mgmt_ie[i].ie_length) {
		if (mwifiex_ie_index_used_by_other_intf(priv, i))
		continue;

		*index = i;
		return 0;
		}
		}

		return -1;
		}

		/* This function prepares IE data buffer for command to be sent to FW */
		static int
		mwifiex_update_autoindex_ies(struct mwifiex_private *priv,
		struct mwifiex_ie_list *ie_list)
		{
		u16 travel_len, index, mask;
		s16 input_len;
		struct mwifiex_ie *ie;
		u8 *tmp;

		input_len = le16_to_cpu(ie_list->len);
		travel_len = sizeof(struct host_cmd_tlv);

		ie_list->len = 0;

		while (input_len > 0) {
		ie = (struct mwifiex_ie )(((u8 )ie_list) + travel_len);
		input_len -= le16_to_cpu(ie->ie_length) + MWIFIEX_IE_HDR_SIZE;
		travel_len += le16_to_cpu(ie->ie_length) + MWIFIEX_IE_HDR_SIZE;

		index = le16_to_cpu(ie->ie_index);
		mask = le16_to_cpu(ie->mgmt_subtype_mask);

		if (index == MWIFIEX_AUTO_IDX_MASK) {
		/* automatic addition */
		if (mwifiex_ie_get_autoidx(priv, mask, ie, &index))
		return -1;
		if (index == MWIFIEX_AUTO_IDX_MASK)
		return -1;

		tmp = (u8 *)&priv->mgmt_ie[index].ie_buffer;
		tmp += le16_to_cpu(priv->mgmt_ie[index].ie_length);
		memcpy(tmp, &ie->ie_buffer, le16_to_cpu(ie->ie_length));
		le16_add_cpu(&priv->mgmt_ie[index].ie_length,
		le16_to_cpu(ie->ie_length));
		priv->mgmt_ie[index].ie_index = cpu_to_le16(index);
		priv->mgmt_ie[index].mgmt_subtype_mask =
		cpu_to_le16(mask);

		ie->ie_index = cpu_to_le16(index);
		ie->ie_length = priv->mgmt_ie[index].ie_length;
		memcpy(&ie->ie_buffer, &priv->mgmt_ie[index].ie_buffer,
		le16_to_cpu(priv->mgmt_ie[index].ie_length));
		} else {
		if (mask != MWIFIEX_DELETE_MASK)
		return -1;
		/*
		* Check if this index is being used on any
		* other interface.
		*/
		if (mwifiex_ie_index_used_by_other_intf(priv, index))
		return -1;

		ie->ie_length = 0;
		memcpy(&priv->mgmt_ie[index], ie,
		sizeof(struct mwifiex_ie));
		}

		le16_add_cpu(&ie_list->len,
		le16_to_cpu(priv->mgmt_ie[index].ie_length) +
		MWIFIEX_IE_HDR_SIZE);
		}

		if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP)
		return mwifiex_send_cmd_async(priv, HostCmd_CMD_UAP_SYS_CONFIG,
		HostCmd_ACT_GEN_SET,
		UAP_CUSTOM_IE_I, ie_list);

		return 0;
		}

drivers/net/wireless/mwifiex/init.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -279,6 +279,7 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
		memset(&adapter->arp_filter, 0, sizeof(adapter->arp_filter));
		adapter->arp_filter_size = 0;
		adapter->channel_type = NL80211_CHAN_HT20;
		adapter->max_mgmt_ie_index = MAX_MGMT_IE_INDEX;
		}

		/*

drivers/net/wireless/mwifiex/ioctl.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -299,6 +299,8 @@ struct mwifiex_ds_read_eeprom {

		#define IEEE_MAX_IE_SIZE 256

		#define MWIFIEX_IE_HDR_SIZE (sizeof(struct mwifiex_ie) - IEEE_MAX_IE_SIZE)

		struct mwifiex_ds_misc_gen_ie {
		u32 type;
		u32 len;

Admin message