diff options
-rw-r--r-- | drivers/net/wireless/libertas/cmd.c | 14 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/decl.h | 4 |
2 files changed, 5 insertions, 13 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c index c3d7f60f93f2..7682b9d27de3 100644 --- a/drivers/net/wireless/libertas/cmd.c +++ b/drivers/net/wireless/libertas/cmd.c | |||
@@ -1155,15 +1155,11 @@ static int lbs_cmd_bcn_ctrl(struct lbs_private * priv, | |||
1155 | return 0; | 1155 | return 0; |
1156 | } | 1156 | } |
1157 | 1157 | ||
1158 | /* | 1158 | static void lbs_queue_cmd(struct lbs_private *priv, |
1159 | * Note: NEVER use lbs_queue_cmd() with addtail==0 other than for | 1159 | struct cmd_ctrl_node *cmdnode) |
1160 | * the command timer, because it does not account for queued commands. | ||
1161 | */ | ||
1162 | void lbs_queue_cmd(struct lbs_private *priv, | ||
1163 | struct cmd_ctrl_node *cmdnode, | ||
1164 | u8 addtail) | ||
1165 | { | 1160 | { |
1166 | unsigned long flags; | 1161 | unsigned long flags; |
1162 | int addtail = 1; | ||
1167 | 1163 | ||
1168 | lbs_deb_enter(LBS_DEB_HOST); | 1164 | lbs_deb_enter(LBS_DEB_HOST); |
1169 | 1165 | ||
@@ -1635,7 +1631,7 @@ int lbs_prepare_and_send_command(struct lbs_private *priv, | |||
1635 | 1631 | ||
1636 | cmdnode->cmdwaitqwoken = 0; | 1632 | cmdnode->cmdwaitqwoken = 0; |
1637 | 1633 | ||
1638 | lbs_queue_cmd(priv, cmdnode, 1); | 1634 | lbs_queue_cmd(priv, cmdnode); |
1639 | wake_up_interruptible(&priv->waitq); | 1635 | wake_up_interruptible(&priv->waitq); |
1640 | 1636 | ||
1641 | if (wait_option & CMD_OPTION_WAITFORRSP) { | 1637 | if (wait_option & CMD_OPTION_WAITFORRSP) { |
@@ -2185,7 +2181,7 @@ struct cmd_ctrl_node *__lbs_cmd_async(struct lbs_private *priv, uint16_t command | |||
2185 | * because the caller of lbs_cmd() sets up all of *cmd for us. */ | 2181 | * because the caller of lbs_cmd() sets up all of *cmd for us. */ |
2186 | 2182 | ||
2187 | cmdnode->cmdwaitqwoken = 0; | 2183 | cmdnode->cmdwaitqwoken = 0; |
2188 | lbs_queue_cmd(priv, cmdnode, 1); | 2184 | lbs_queue_cmd(priv, cmdnode); |
2189 | wake_up_interruptible(&priv->waitq); | 2185 | wake_up_interruptible(&priv->waitq); |
2190 | 2186 | ||
2191 | done: | 2187 | done: |
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h index 5dd5c9e09282..aaacd9bd6bd2 100644 --- a/drivers/net/wireless/libertas/decl.h +++ b/drivers/net/wireless/libertas/decl.h | |||
@@ -28,10 +28,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv, | |||
28 | u16 cmd_action, | 28 | u16 cmd_action, |
29 | u16 wait_option, u32 cmd_oid, void *pdata_buf); | 29 | u16 wait_option, u32 cmd_oid, void *pdata_buf); |
30 | 30 | ||
31 | void lbs_queue_cmd(struct lbs_private *priv, | ||
32 | struct cmd_ctrl_node *cmdnode, | ||
33 | u8 addtail); | ||
34 | |||
35 | int lbs_allocate_cmd_buffer(struct lbs_private *priv); | 31 | int lbs_allocate_cmd_buffer(struct lbs_private *priv); |
36 | int lbs_execute_next_command(struct lbs_private *priv); | 32 | int lbs_execute_next_command(struct lbs_private *priv); |
37 | int lbs_process_event(struct lbs_private *priv); | 33 | int lbs_process_event(struct lbs_private *priv); |