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

Commit 183aeac1 authored by David Woodhouse's avatar David Woodhouse Committed by David S. Miller
Browse files

libertas: introduce and use lbs_complete_command() for command completion 



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

drivers/net/wireless/libertas/cmd.c

+18 −7
Original line number Diff line number Diff line
@@ -1230,9 +1230,7 @@ static int lbs_submit_command(struct lbs_private *priv, 
	if (ret) {

		lbs_pr_info("DNLD_CMD: hw_host_to_card failed: %d\n", ret);

		spin_lock_irqsave(&priv->driver_lock, flags);

		priv->cur_cmd_retcode = ret;

		__lbs_cleanup_and_insert_cmd(priv, priv->cur_cmd);

		priv->cur_cmd = NULL;

		lbs_complete_command(priv, priv->cur_cmd, ret);

		spin_unlock_irqrestore(&priv->driver_lock, flags);

		goto done;

	}
@@ -1275,7 +1273,7 @@ static int lbs_cmd_mac_control(struct lbs_private *priv, 
 *  This function inserts command node to cmdfreeq

 *  after cleans it. Requires priv->driver_lock held.

 */

void __lbs_cleanup_and_insert_cmd(struct lbs_private *priv,

static void __lbs_cleanup_and_insert_cmd(struct lbs_private *priv,

					 struct cmd_ctrl_node *ptempcmd)

{
@@ -1296,6 +1294,15 @@ static void lbs_cleanup_and_insert_cmd(struct lbs_private *priv, 
	spin_unlock_irqrestore(&priv->driver_lock, flags);

}



void lbs_complete_command(struct lbs_private *priv, struct cmd_ctrl_node *cmd,

			  int result)

{

	if (cmd == priv->cur_cmd)

		priv->cur_cmd_retcode = result;

	__lbs_cleanup_and_insert_cmd(priv, cmd);

	priv->cur_cmd = NULL;

}



int lbs_set_radio_control(struct lbs_private *priv)

{

	int ret = 0;
@@ -1901,7 +1908,9 @@ int lbs_execute_next_command(struct lbs_private *priv) 
					lbs_deb_host(

					       "EXEC_NEXT_CMD: ignore ENTER_PS cmd\n");

					list_del(&cmdnode->list);

					lbs_cleanup_and_insert_cmd(priv, cmdnode);

					spin_lock_irqsave(&priv->driver_lock, flags);

					lbs_complete_command(priv, cmdnode, 0);

					spin_unlock_irqrestore(&priv->driver_lock, flags);



					ret = 0;

					goto done;
@@ -1912,7 +1921,9 @@ int lbs_execute_next_command(struct lbs_private *priv) 
					lbs_deb_host(

					       "EXEC_NEXT_CMD: ignore EXIT_PS cmd in sleep\n");

					list_del(&cmdnode->list);

					lbs_cleanup_and_insert_cmd(priv, cmdnode);

					spin_lock_irqsave(&priv->driver_lock, flags);

					lbs_complete_command(priv, cmdnode, 0);

					spin_unlock_irqrestore(&priv->driver_lock, flags);

					priv->needtowakeup = 1;



					ret = 0;

drivers/net/wireless/libertas/cmdresp.c

+3 −7
Original line number Diff line number Diff line
@@ -717,8 +717,7 @@ int lbs_process_rx_command(struct lbs_private *priv) 
			lbs_deb_host("CMD_RESP: PS action 0x%X\n", action);

		}



		__lbs_cleanup_and_insert_cmd(priv, priv->cur_cmd);

		priv->cur_cmd = NULL;

		lbs_complete_command(priv, priv->cur_cmd, result);

		spin_unlock_irqrestore(&priv->driver_lock, flags);



		ret = 0;
@@ -739,9 +738,7 @@ int lbs_process_rx_command(struct lbs_private *priv) 
			break;



		}



		__lbs_cleanup_and_insert_cmd(priv, priv->cur_cmd);

		priv->cur_cmd = NULL;

		lbs_complete_command(priv, priv->cur_cmd, result);

		spin_unlock_irqrestore(&priv->driver_lock, flags);



		ret = -1;
@@ -760,8 +757,7 @@ int lbs_process_rx_command(struct lbs_private *priv) 


	if (priv->cur_cmd) {

		/* Clean up and Put current command back to cmdfreeq */

		__lbs_cleanup_and_insert_cmd(priv, priv->cur_cmd);

		priv->cur_cmd = NULL;

		lbs_complete_command(priv, priv->cur_cmd, result);

	}

	spin_unlock_irqrestore(&priv->driver_lock, flags);

drivers/net/wireless/libertas/decl.h

+2 −3
Original line number Diff line number Diff line
@@ -45,9 +45,8 @@ void lbs_get_fwversion(struct lbs_private *priv, 


/** The proc fs interface */

int lbs_process_rx_command(struct lbs_private *priv);

void __lbs_cleanup_and_insert_cmd(struct lbs_private *priv,

	struct cmd_ctrl_node *ptempcmd);



void lbs_complete_command(struct lbs_private *priv, struct cmd_ctrl_node *cmd,

			  int result);

int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev);

int lbs_set_regiontable(struct lbs_private *priv, u8 region, u8 band);