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

Commit 1309b55b authored by David Woodhouse's avatar David Woodhouse Committed by David S. Miller
Browse files

libertas: add opaque extra argument to cmd callback function 



This will be useful for letting callbacks do stuff like copying the
response into a buffer provided by the caller of lbs_cmd()

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b6b8abe4

drivers/net/wireless/libertas/cmd.c

+5 −1
Original line number Diff line number Diff line
@@ -1642,6 +1642,7 @@ static void cleanup_cmdnode(struct cmd_ctrl_node *ptempnode) 
	ptempnode->wait_option = 0;

	ptempnode->pdata_buf = NULL;

	ptempnode->callback = NULL;

	ptempnode->callback_arg = 0;



	if (ptempnode->bufvirtualaddr != NULL)

		memset(ptempnode->bufvirtualaddr, 0, MRVDRV_SIZE_OF_CMD_BUFFER);
@@ -1670,6 +1671,7 @@ void lbs_set_cmd_ctrl_node(struct lbs_private *priv, 
	ptempnode->wait_option = wait_option;

	ptempnode->pdata_buf = pdata_buf;

	ptempnode->callback = NULL;

	ptempnode->callback_arg = 0;



	lbs_deb_leave(LBS_DEB_HOST);

}
@@ -1993,7 +1995,8 @@ void lbs_ps_confirm_sleep(struct lbs_private *priv, u16 psmode) 
 */



int lbs_cmd(struct lbs_private *priv, uint16_t command, void *cmd, int cmd_size,

	    int (*callback)(uint16_t, struct cmd_ds_command *, struct lbs_private *))

	    int (*callback)(struct lbs_private *, unsigned long, struct cmd_ds_command *),

	    unsigned long callback_arg)

{

	struct cmd_ctrl_node *cmdnode;

	struct cmd_ds_gen *cmdptr;
@@ -2028,6 +2031,7 @@ int lbs_cmd(struct lbs_private *priv, uint16_t command, void *cmd, int cmd_size, 
	cmdptr = (struct cmd_ds_gen *)cmdnode->bufvirtualaddr;

	cmdnode->wait_option = CMD_OPTION_WAITFORRSP;

	cmdnode->callback = callback;

	cmdnode->callback_arg = callback_arg;



	/* Set sequence number, clean result, move to buffer */

	priv->seqnum++;

drivers/net/wireless/libertas/cmdresp.c

+6 −5
Original line number Diff line number Diff line
@@ -552,12 +552,13 @@ static int lbs_ret_802_11_subscribe_event(struct lbs_private *priv, 
	return 0;

}



static inline int handle_cmd_response(u16 respcmd,

				      struct cmd_ds_command *resp,

				      struct lbs_private *priv)

static inline int handle_cmd_response(struct lbs_private *priv,

				      unsigned long dummy,

				      struct cmd_ds_command *resp)

{

	int ret = 0;

	unsigned long flags;

	uint16_t respcmd = le16_to_cpu(resp->command);



	lbs_deb_enter(LBS_DEB_HOST);
@@ -861,9 +862,9 @@ int lbs_process_rx_command(struct lbs_private *priv) 
	spin_unlock_irqrestore(&priv->driver_lock, flags);



	if (priv->cur_cmd && priv->cur_cmd->callback)

		ret = priv->cur_cmd->callback(respcmd, resp, priv);

		ret = priv->cur_cmd->callback(priv, priv->cur_cmd->callback_arg, resp);

	else

		ret = handle_cmd_response(respcmd, resp, priv);

		ret = handle_cmd_response(priv, 0, resp);



	spin_lock_irqsave(&priv->driver_lock, flags);

drivers/net/wireless/libertas/decl.h

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ void lbs_send_tx_feedback(struct lbs_private *priv); 
int lbs_free_cmd_buffer(struct lbs_private *priv);



int lbs_cmd(struct lbs_private *priv, uint16_t command, void *cmd, int cmd_size, 

	    int (*callback)(uint16_t, struct cmd_ds_command *, struct lbs_private *));

	    int (*callback)(struct lbs_private *, unsigned long, struct cmd_ds_command *),

	    unsigned long callback_arg);



int lbs_prepare_and_send_command(struct lbs_private *priv,

	u16 cmd_no,

drivers/net/wireless/libertas/hostcmd.h

+2 −1
Original line number Diff line number Diff line
@@ -71,7 +71,8 @@ struct cmd_ctrl_node { 
	u16 wait_option;

	/* command response */

	void *pdata_buf;

	int (*callback)(uint16_t respcmd, struct cmd_ds_command *resp, struct lbs_private *priv);

	int (*callback)(struct lbs_private *priv, unsigned long arg, struct cmd_ds_command *resp);

	unsigned long callback_arg;

	/* command data */

	u8 *bufvirtualaddr;

	/* wait queue */

drivers/net/wireless/libertas/if_usb.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static void if_usb_set_boot2_ver(struct lbs_private *priv) 
	b2_cmd.action = 0;

	b2_cmd.version = priv->boot2_version;



	if (lbs_cmd(priv, CMD_SET_BOOT2_VER, &b2_cmd, sizeof(b2_cmd), NULL))

	if (lbs_cmd(priv, CMD_SET_BOOT2_VER, &b2_cmd, sizeof(b2_cmd), NULL, 0))

		lbs_deb_usb("Setting boot2 version failed\n");

}