diff options
-rw-r--r-- | drivers/net/wireless/libertas/cmd.c | 9 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/decl.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/hostcmd.h | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c index d98bec92474b..6658590ca6e3 100644 --- a/drivers/net/wireless/libertas/cmd.c +++ b/drivers/net/wireless/libertas/cmd.c | |||
@@ -1231,7 +1231,7 @@ int lbs_prepare_and_send_command(struct lbs_private *priv, | |||
1231 | goto done; | 1231 | goto done; |
1232 | } | 1232 | } |
1233 | 1233 | ||
1234 | lbs_set_cmd_ctrl_node(priv, cmdnode, cmd_oid, wait_option, pdata_buf); | 1234 | lbs_set_cmd_ctrl_node(priv, cmdnode, wait_option, pdata_buf); |
1235 | 1235 | ||
1236 | cmdptr = (struct cmd_ds_command *)cmdnode->bufvirtualaddr; | 1236 | cmdptr = (struct cmd_ds_command *)cmdnode->bufvirtualaddr; |
1237 | 1237 | ||
@@ -1404,7 +1404,7 @@ int lbs_prepare_and_send_command(struct lbs_private *priv, | |||
1404 | case CMD_802_11_INACTIVITY_TIMEOUT: | 1404 | case CMD_802_11_INACTIVITY_TIMEOUT: |
1405 | ret = lbs_cmd_802_11_inactivity_timeout(priv, cmdptr, | 1405 | ret = lbs_cmd_802_11_inactivity_timeout(priv, cmdptr, |
1406 | cmd_action, pdata_buf); | 1406 | cmd_action, pdata_buf); |
1407 | lbs_set_cmd_ctrl_node(priv, cmdnode, 0, 0, pdata_buf); | 1407 | lbs_set_cmd_ctrl_node(priv, cmdnode, 0, pdata_buf); |
1408 | break; | 1408 | break; |
1409 | 1409 | ||
1410 | case CMD_802_11_TPC_CFG: | 1410 | case CMD_802_11_TPC_CFG: |
@@ -1668,7 +1668,6 @@ static void cleanup_cmdnode(struct cmd_ctrl_node *ptempnode) | |||
1668 | ptempnode->cmdwaitqwoken = 1; | 1668 | ptempnode->cmdwaitqwoken = 1; |
1669 | wake_up_interruptible(&ptempnode->cmdwait_q); | 1669 | wake_up_interruptible(&ptempnode->cmdwait_q); |
1670 | ptempnode->status = 0; | 1670 | ptempnode->status = 0; |
1671 | ptempnode->cmd_oid = (u32) 0; | ||
1672 | ptempnode->wait_option = 0; | 1671 | ptempnode->wait_option = 0; |
1673 | ptempnode->pdata_buf = NULL; | 1672 | ptempnode->pdata_buf = NULL; |
1674 | 1673 | ||
@@ -1683,21 +1682,19 @@ static void cleanup_cmdnode(struct cmd_ctrl_node *ptempnode) | |||
1683 | * | 1682 | * |
1684 | * @param priv A pointer to struct lbs_private structure | 1683 | * @param priv A pointer to struct lbs_private structure |
1685 | * @param ptempnode A pointer to cmd_ctrl_node structure | 1684 | * @param ptempnode A pointer to cmd_ctrl_node structure |
1686 | * @param cmd_oid cmd oid: treated as sub command | ||
1687 | * @param wait_option wait option: wait response or not | 1685 | * @param wait_option wait option: wait response or not |
1688 | * @param pdata_buf A pointer to informaion buffer | 1686 | * @param pdata_buf A pointer to informaion buffer |
1689 | * @return 0 or -1 | 1687 | * @return 0 or -1 |
1690 | */ | 1688 | */ |
1691 | void lbs_set_cmd_ctrl_node(struct lbs_private *priv, | 1689 | void lbs_set_cmd_ctrl_node(struct lbs_private *priv, |
1692 | struct cmd_ctrl_node *ptempnode, | 1690 | struct cmd_ctrl_node *ptempnode, |
1693 | u32 cmd_oid, u16 wait_option, void *pdata_buf) | 1691 | u16 wait_option, void *pdata_buf) |
1694 | { | 1692 | { |
1695 | lbs_deb_enter(LBS_DEB_HOST); | 1693 | lbs_deb_enter(LBS_DEB_HOST); |
1696 | 1694 | ||
1697 | if (!ptempnode) | 1695 | if (!ptempnode) |
1698 | return; | 1696 | return; |
1699 | 1697 | ||
1700 | ptempnode->cmd_oid = cmd_oid; | ||
1701 | ptempnode->wait_option = wait_option; | 1698 | ptempnode->wait_option = wait_option; |
1702 | ptempnode->pdata_buf = pdata_buf; | 1699 | ptempnode->pdata_buf = pdata_buf; |
1703 | 1700 | ||
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h index 74187f34666f..447297a5e686 100644 --- a/drivers/net/wireless/libertas/decl.h +++ b/drivers/net/wireless/libertas/decl.h | |||
@@ -26,7 +26,7 @@ struct cmd_ctrl_node *lbs_get_free_cmd_ctrl_node(struct lbs_private *priv); | |||
26 | 26 | ||
27 | void lbs_set_cmd_ctrl_node(struct lbs_private *priv, | 27 | void lbs_set_cmd_ctrl_node(struct lbs_private *priv, |
28 | struct cmd_ctrl_node *ptempnode, | 28 | struct cmd_ctrl_node *ptempnode, |
29 | u32 cmd_oid, u16 wait_option, void *pdata_buf); | 29 | u16 wait_option, void *pdata_buf); |
30 | 30 | ||
31 | int lbs_prepare_and_send_command(struct lbs_private *priv, | 31 | int lbs_prepare_and_send_command(struct lbs_private *priv, |
32 | u16 cmd_no, | 32 | u16 cmd_no, |
diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h index 614db6c74576..c02914900755 100644 --- a/drivers/net/wireless/libertas/hostcmd.h +++ b/drivers/net/wireless/libertas/hostcmd.h | |||
@@ -69,8 +69,6 @@ struct cmd_ctrl_node { | |||
69 | /* CMD link list */ | 69 | /* CMD link list */ |
70 | struct list_head list; | 70 | struct list_head list; |
71 | u32 status; | 71 | u32 status; |
72 | /* CMD ID */ | ||
73 | u32 cmd_oid; | ||
74 | /*CMD wait option: wait for finish or no wait */ | 72 | /*CMD wait option: wait for finish or no wait */ |
75 | u16 wait_option; | 73 | u16 wait_option; |
76 | /* command parameter */ | 74 | /* command parameter */ |