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

Commit 0f9e9b8b authored by Avinash Patil's avatar Avinash Patil Committed by John W. Linville
Browse files

mwifiex: add del_station handler 



This patch adds cfg80211 del_station handler for mwifiex.
If bss is not started or there are no stations in associated
stations list, no action is taken. If argument received is
null/broadcast mac, all stations in associated station list are
deauthenticated.

Patch also deletes related RxReorder stream and TxBA stream tables
for related station.

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

drivers/net/wireless/mwifiex/cfg80211.c

+46 −0
Original line number Diff line number Diff line
@@ -1231,6 +1231,51 @@ static int mwifiex_cfg80211_change_beacon(struct wiphy *wiphy, 
	return 0;

}



/* cfg80211 operation handler for del_station.

 * Function deauthenticates station which value is provided in mac parameter.

 * If mac is NULL/broadcast, all stations in associated station list are

 * deauthenticated. If bss is not started or there are no stations in

 * associated stations list, no action is taken.

 */

static int

mwifiex_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev,

			     u8 *mac)

{

	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);

	struct mwifiex_sta_node *sta_node;

	unsigned long flags;



	if (list_empty(&priv->sta_list) || !priv->bss_started)

		return 0;



	if (!mac || is_broadcast_ether_addr(mac)) {

		wiphy_dbg(wiphy, "%s: NULL/broadcast mac address\n", __func__);

		list_for_each_entry(sta_node, &priv->sta_list, list) {

			if (mwifiex_send_cmd_sync(priv,

						  HostCmd_CMD_UAP_STA_DEAUTH,

						  HostCmd_ACT_GEN_SET, 0,

						  sta_node->mac_addr))

				return -1;

			mwifiex_uap_del_sta_data(priv, sta_node);

		}

	} else {

		wiphy_dbg(wiphy, "%s: mac address %pM\n", __func__, mac);

		spin_lock_irqsave(&priv->sta_list_spinlock, flags);

		sta_node = mwifiex_get_sta_entry(priv, mac);

		spin_unlock_irqrestore(&priv->sta_list_spinlock, flags);

		if (sta_node) {

			if (mwifiex_send_cmd_sync(priv,

						  HostCmd_CMD_UAP_STA_DEAUTH,

						  HostCmd_ACT_GEN_SET, 0,

						  sta_node->mac_addr))

				return -1;

			mwifiex_uap_del_sta_data(priv, sta_node);

		}

	}



	return 0;

}



static int

mwifiex_cfg80211_set_antenna(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant)

{
@@ -2425,6 +2470,7 @@ static struct cfg80211_ops mwifiex_cfg80211_ops = { 
	.change_beacon = mwifiex_cfg80211_change_beacon,

	.set_cqm_rssi_config = mwifiex_cfg80211_set_cqm_rssi_config,

	.set_antenna = mwifiex_cfg80211_set_antenna,

	.del_station = mwifiex_cfg80211_del_station,

#ifdef CONFIG_PM

	.suspend = mwifiex_cfg80211_suspend,

	.resume = mwifiex_cfg80211_resume,

drivers/net/wireless/mwifiex/cmdevt.c

+1 −0
Original line number Diff line number Diff line
@@ -570,6 +570,7 @@ int mwifiex_send_cmd_async(struct mwifiex_private *priv, uint16_t cmd_no, 
		case HostCmd_CMD_UAP_SYS_CONFIG:

		case HostCmd_CMD_UAP_BSS_START:

		case HostCmd_CMD_UAP_BSS_STOP:

		case HostCmd_CMD_UAP_STA_DEAUTH:

			ret = mwifiex_uap_prepare_cmd(priv, cmd_no, cmd_action,

						      cmd_oid, data_buf,

						      cmd_ptr);

drivers/net/wireless/mwifiex/fw.h

+7 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER { 
#define HostCmd_CMD_UAP_SYS_CONFIG                    0x00b0

#define HostCmd_CMD_UAP_BSS_START                     0x00b1

#define HostCmd_CMD_UAP_BSS_STOP                      0x00b2

#define HostCmd_CMD_UAP_STA_DEAUTH                    0x00b5

#define HostCmd_CMD_11N_CFG                           0x00cd

#define HostCmd_CMD_11N_ADDBA_REQ                     0x00ce

#define HostCmd_CMD_11N_ADDBA_RSP                     0x00cf
@@ -1197,6 +1198,11 @@ struct host_cmd_ds_amsdu_aggr_ctrl { 
	__le16 curr_buf_size;

} __packed;



struct host_cmd_ds_sta_deauth {

	u8 mac[ETH_ALEN];

	__le16 reason;

} __packed;



struct mwifiex_ie_types_wmm_param_set {

	struct mwifiex_ie_types_header header;

	u8 wmm_ie[1];
@@ -1630,6 +1636,7 @@ struct host_cmd_ds_command { 
		struct host_cmd_ds_802_11_eeprom_access eeprom;

		struct host_cmd_ds_802_11_subsc_evt subsc_evt;

		struct host_cmd_ds_sys_config uap_sys_config;

		struct host_cmd_ds_sta_deauth sta_deauth;

		struct host_cmd_11ac_vht_cfg vht_cfg;

	} params;

} __packed;

drivers/net/wireless/mwifiex/main.h

+2 −0
Original line number Diff line number Diff line
@@ -1115,6 +1115,8 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv, 
			 struct cfg80211_beacon_data *data);

int mwifiex_del_mgmt_ies(struct mwifiex_private *priv);

u8 *mwifiex_11d_code_2_region(u8 code);

void mwifiex_uap_del_sta_data(struct mwifiex_private *priv,

			      struct mwifiex_sta_node *node);



extern const struct ethtool_ops mwifiex_ethtool_ops;

drivers/net/wireless/mwifiex/sta_cmdresp.c

+2 −0
Original line number Diff line number Diff line
@@ -978,6 +978,8 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv, u16 cmdresp_no, 
	case HostCmd_CMD_UAP_BSS_STOP:

		priv->bss_started = 0;

		break;

	case HostCmd_CMD_UAP_STA_DEAUTH:

		break;

	case HostCmd_CMD_MEF_CFG:

		break;

	default: