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

Commit 191bb40e authored by Dan Williams's avatar Dan Williams Committed by John W. Linville
Browse files

libertas: convert CMD_802_11_DEAUTHENTICATE to a direct command 



and remove DISASSOCIATE because it's not in any of the specs and has
never been used.

Signed-off-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 87c8c72d

drivers/net/wireless/libertas/assoc.c

+26 −35
Original line number Diff line number Diff line
@@ -1029,7 +1029,9 @@ void lbs_association_worker(struct work_struct *work) 
	 */

	if (priv->mode == IW_MODE_INFRA) {

		if (should_deauth_infrastructure(priv, assoc_req)) {

			ret = lbs_send_deauthentication(priv);

			ret = lbs_cmd_80211_deauthenticate(priv,

							   priv->curbssparams.bssid,

							   WLAN_REASON_DEAUTH_LEAVING);

			if (ret) {

				lbs_deb_assoc("Deauthentication due to new "

					"configuration request failed: %d\n",
@@ -1289,18 +1291,6 @@ static void lbs_set_basic_rate_flags(u8 *rates, size_t len) 
	}

}



/**

 *  @brief Send Deauthentication Request

 *

 *  @param priv      A pointer to struct lbs_private structure

 *  @return          0--success, -1--fail

 */

int lbs_send_deauthentication(struct lbs_private *priv)

{

	return lbs_prepare_and_send_command(priv, CMD_802_11_DEAUTHENTICATE,

				     0, CMD_OPTION_WAITFORRSP, 0, NULL);

}



/**

 *  @brief This function prepares command of authenticate.

 *
@@ -1353,26 +1343,37 @@ int lbs_cmd_80211_authenticate(struct lbs_private *priv, 
	return ret;

}



int lbs_cmd_80211_deauthenticate(struct lbs_private *priv,

				   struct cmd_ds_command *cmd)

/**

 *  @brief Deauthenticate from a specific BSS

 *

 *  @param priv        A pointer to struct lbs_private structure

 *  @param bssid       The specific BSS to deauthenticate from

 *  @param reason      The 802.11 sec. 7.3.1.7 Reason Code for deauthenticating

 *

 *  @return            0 on success, error on failure

 */

int lbs_cmd_80211_deauthenticate(struct lbs_private *priv, u8 bssid[ETH_ALEN],

				 u16 reason)

{

	struct cmd_ds_802_11_deauthenticate *dauth = &cmd->params.deauth;

	struct cmd_ds_802_11_deauthenticate cmd;

	int ret;



	lbs_deb_enter(LBS_DEB_JOIN);



	cmd->command = cpu_to_le16(CMD_802_11_DEAUTHENTICATE);

	cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_deauthenticate) +

			     S_DS_GEN);

	memset(&cmd, 0, sizeof(cmd));

	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	memcpy(cmd.macaddr, &bssid[0], ETH_ALEN);

	cmd.reasoncode = cpu_to_le16(reason);



	/* set AP MAC address */

	memmove(dauth->macaddr, priv->curbssparams.bssid, ETH_ALEN);

	ret = lbs_cmd_with_response(priv, CMD_802_11_DEAUTHENTICATE, &cmd);



	/* Reason code 3 = Station is leaving */

#define REASON_CODE_STA_LEAVING 3

	dauth->reasoncode = cpu_to_le16(REASON_CODE_STA_LEAVING);

	/* Clean up everything even if there was an error; can't assume that

	 * we're still authenticated to the AP after trying to deauth.

	 */

	lbs_mac_event_disconnected(priv);



	lbs_deb_leave(LBS_DEB_JOIN);

	return 0;

	return ret;

}



int lbs_cmd_80211_associate(struct lbs_private *priv,
@@ -1815,16 +1816,6 @@ int lbs_ret_80211_associate(struct lbs_private *priv, 
	return ret;

}



int lbs_ret_80211_disassociate(struct lbs_private *priv)

{

	lbs_deb_enter(LBS_DEB_JOIN);



	lbs_mac_event_disconnected(priv);



	lbs_deb_leave(LBS_DEB_JOIN);

	return 0;

}



int lbs_ret_80211_ad_hoc_start(struct lbs_private *priv,

				 struct cmd_ds_command *resp)

{

drivers/net/wireless/libertas/assoc.h

+1 −4
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ int lbs_cmd_80211_ad_hoc_start(struct lbs_private *priv, 
					struct cmd_ds_command *cmd,

					void *pdata_buf);

int lbs_cmd_80211_deauthenticate(struct lbs_private *priv,

					  struct cmd_ds_command *cmd);

				 u8 bssid[ETH_ALEN], u16 reason);

int lbs_cmd_80211_associate(struct lbs_private *priv,

				     struct cmd_ds_command *cmd,

				     void *pdata_buf);
@@ -28,12 +28,9 @@ int lbs_cmd_80211_associate(struct lbs_private *priv, 
int lbs_ret_80211_ad_hoc_start(struct lbs_private *priv,

					struct cmd_ds_command *resp);

int lbs_ret_80211_ad_hoc_stop(struct lbs_private *priv);

int lbs_ret_80211_disassociate(struct lbs_private *priv);

int lbs_ret_80211_associate(struct lbs_private *priv,

				     struct cmd_ds_command *resp);



int lbs_stop_adhoc_network(struct lbs_private *priv);



int lbs_send_deauthentication(struct lbs_private *priv);



#endif /* _LBS_ASSOC_H */

drivers/net/wireless/libertas/cmd.c

+0 −4
Original line number Diff line number Diff line
@@ -1413,10 +1413,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv, 
		ret = lbs_cmd_80211_associate(priv, cmdptr, pdata_buf);

		break;



	case CMD_802_11_DEAUTHENTICATE:

		ret = lbs_cmd_80211_deauthenticate(priv, cmdptr);

		break;



	case CMD_802_11_AD_HOC_START:

		ret = lbs_cmd_80211_ad_hoc_start(priv, cmdptr, pdata_buf);

		break;

drivers/net/wireless/libertas/cmdresp.c

+0 −5
Original line number Diff line number Diff line
@@ -258,11 +258,6 @@ static inline int handle_cmd_response(struct lbs_private *priv, 
		ret = lbs_ret_80211_associate(priv, resp);

		break;



	case CMD_RET(CMD_802_11_DISASSOCIATE):

	case CMD_RET(CMD_802_11_DEAUTHENTICATE):

		ret = lbs_ret_80211_disassociate(priv);

		break;



	case CMD_RET(CMD_802_11_AD_HOC_START):

	case CMD_RET(CMD_802_11_AD_HOC_JOIN):

		ret = lbs_ret_80211_ad_hoc_start(priv, resp);

drivers/net/wireless/libertas/host.h

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ 
#define CMD_RF_REG_MAP				0x0023

#define CMD_802_11_DEAUTHENTICATE		0x0024

#define CMD_802_11_REASSOCIATE			0x0025

#define CMD_802_11_DISASSOCIATE			0x0026

#define CMD_MAC_CONTROL				0x0028

#define CMD_802_11_AD_HOC_START			0x002b

#define CMD_802_11_AD_HOC_JOIN			0x002c