Skip to content

Commit

Permalink
libertas: kill 'addtail' argument to lbs_queue_cmd() and make it static
Browse files Browse the repository at this point in the history
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
David Woodhouse authored and David S. Miller committed Jan 28, 2008
1 parent 2a34509 commit 681ffbb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
14 changes: 5 additions & 9 deletions drivers/net/wireless/libertas/cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1155,15 +1155,11 @@ static int lbs_cmd_bcn_ctrl(struct lbs_private * priv,
return 0;
}

/*
* Note: NEVER use lbs_queue_cmd() with addtail==0 other than for
* the command timer, because it does not account for queued commands.
*/
void lbs_queue_cmd(struct lbs_private *priv,
struct cmd_ctrl_node *cmdnode,
u8 addtail)
static void lbs_queue_cmd(struct lbs_private *priv,
struct cmd_ctrl_node *cmdnode)
{
unsigned long flags;
int addtail = 1;

lbs_deb_enter(LBS_DEB_HOST);

Expand Down Expand Up @@ -1635,7 +1631,7 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,

cmdnode->cmdwaitqwoken = 0;

lbs_queue_cmd(priv, cmdnode, 1);
lbs_queue_cmd(priv, cmdnode);
wake_up_interruptible(&priv->waitq);

if (wait_option & CMD_OPTION_WAITFORRSP) {
Expand Down Expand Up @@ -2185,7 +2181,7 @@ struct cmd_ctrl_node *__lbs_cmd_async(struct lbs_private *priv, uint16_t command
* because the caller of lbs_cmd() sets up all of *cmd for us. */

cmdnode->cmdwaitqwoken = 0;
lbs_queue_cmd(priv, cmdnode, 1);
lbs_queue_cmd(priv, cmdnode);
wake_up_interruptible(&priv->waitq);

done:
Expand Down
4 changes: 0 additions & 4 deletions drivers/net/wireless/libertas/decl.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
u16 cmd_action,
u16 wait_option, u32 cmd_oid, void *pdata_buf);

void lbs_queue_cmd(struct lbs_private *priv,
struct cmd_ctrl_node *cmdnode,
u8 addtail);

int lbs_allocate_cmd_buffer(struct lbs_private *priv);
int lbs_execute_next_command(struct lbs_private *priv);
int lbs_process_event(struct lbs_private *priv);
Expand Down

0 comments on commit 681ffbb

Please sign in to comment.