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

Commit 835d3ac5 authored by Holger Schurig's avatar Holger Schurig Committed by John W. Linville
Browse files

libertas: convert CMD_MAC_CONTROL to a direct command 



convert CMD_MAC_CONTROL to a direct command

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 06802a81

drivers/net/wireless/libertas/cmd.c

+6 −25
Original line number Diff line number Diff line
@@ -1200,24 +1200,6 @@ static void lbs_submit_command(struct lbs_private *priv, 
	lbs_deb_leave(LBS_DEB_HOST);

}



static int lbs_cmd_mac_control(struct lbs_private *priv,

				struct cmd_ds_command *cmd)

{

	struct cmd_ds_mac_control *mac = &cmd->params.macctrl;



	lbs_deb_enter(LBS_DEB_CMD);



	cmd->command = cpu_to_le16(CMD_MAC_CONTROL);

	cmd->size = cpu_to_le16(sizeof(struct cmd_ds_mac_control) + S_DS_GEN);

	mac->action = cpu_to_le16(priv->currentpacketfilter);



	lbs_deb_cmd("MAC_CONTROL: action 0x%04x, size %d\n",

		    le16_to_cpu(mac->action), le16_to_cpu(cmd->size));



	lbs_deb_leave(LBS_DEB_CMD);

	return 0;

}



/**

 *  This function inserts command node to cmdfreeq

 *  after cleans it. Requires priv->driver_lock held.
@@ -1307,12 +1289,15 @@ int lbs_set_radio_control(struct lbs_private *priv) 
int lbs_set_mac_packet_filter(struct lbs_private *priv)

{

	int ret = 0;

	struct cmd_ds_mac_control cmd;



	lbs_deb_enter(LBS_DEB_CMD);



	/* Send MAC control command to station */

	ret = lbs_prepare_and_send_command(priv,

				    CMD_MAC_CONTROL, 0, 0, 0, NULL);

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

	cmd.action = cpu_to_le16(priv->currentpacketfilter);

	cmd.reserved = 0;



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



	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);

	return ret;
@@ -1382,10 +1367,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv, 
		ret = lbs_cmd_802_11_ps_mode(priv, cmdptr, cmd_action);

		break;



	case CMD_MAC_CONTROL:

		ret = lbs_cmd_mac_control(priv, cmdptr);

		break;



	case CMD_802_11_ASSOCIATE:

	case CMD_802_11_REASSOCIATE:

		ret = lbs_cmd_80211_associate(priv, cmdptr, pdata_buf);

drivers/net/wireless/libertas/cmdresp.c

+0 −1
Original line number Diff line number Diff line
@@ -394,7 +394,6 @@ static inline int handle_cmd_response(struct lbs_private *priv, 
		break;



	case CMD_RET(CMD_MAC_MULTICAST_ADR):

	case CMD_RET(CMD_MAC_CONTROL):

	case CMD_RET(CMD_802_11_RESET):

	case CMD_RET(CMD_802_11_AUTHENTICATE):

	case CMD_RET(CMD_802_11_BEACON_STOP):

drivers/net/wireless/libertas/hostcmd.h

+2 −2
Original line number Diff line number Diff line
@@ -211,8 +211,9 @@ struct cmd_ds_802_11_get_log { 
};



struct cmd_ds_mac_control {

	struct cmd_header hdr;

	__le16 action;

	__le16 reserved;

	u16 reserved;

};



struct cmd_ds_mac_multicast_adr {
@@ -695,7 +696,6 @@ struct cmd_ds_command { 
	/* command Body */

	union {

		struct cmd_ds_802_11_ps_mode psmode;

		struct cmd_ds_mac_control macctrl;

		struct cmd_ds_802_11_associate associate;

		struct cmd_ds_802_11_deauthenticate deauth;

		struct cmd_ds_802_11_ad_hoc_start ads;