diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-12-01 15:15:41 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:06:00 -0800 |
| commit | f5ece8fc8d3f5e36bda3554b74b0fbecb0a14309 (patch) | |
| tree | 947509c1b56cd4c8a583efbc9f90551ceec2a408 /drivers/net/wireless | |
| parent | 77d8cf2c093be3b58f6deed10673d0bc8cbd4202 (diff) | |
| download | blackbird-op-linux-f5ece8fc8d3f5e36bda3554b74b0fbecb0a14309.tar.gz blackbird-op-linux-f5ece8fc8d3f5e36bda3554b74b0fbecb0a14309.zip | |
libertas: Remove cmd_oid from struct cmd_ctrl_node
This is only needed for SNMP and key operations; it doesn't need to be
preserved outside that context.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
| -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, goto done; } - lbs_set_cmd_ctrl_node(priv, cmdnode, cmd_oid, wait_option, pdata_buf); + lbs_set_cmd_ctrl_node(priv, cmdnode, wait_option, pdata_buf); cmdptr = (struct cmd_ds_command *)cmdnode->bufvirtualaddr; @@ -1404,7 +1404,7 @@ int lbs_prepare_and_send_command(struct lbs_private *priv, case CMD_802_11_INACTIVITY_TIMEOUT: ret = lbs_cmd_802_11_inactivity_timeout(priv, cmdptr, cmd_action, pdata_buf); - lbs_set_cmd_ctrl_node(priv, cmdnode, 0, 0, pdata_buf); + lbs_set_cmd_ctrl_node(priv, cmdnode, 0, pdata_buf); break; case CMD_802_11_TPC_CFG: @@ -1668,7 +1668,6 @@ static void cleanup_cmdnode(struct cmd_ctrl_node *ptempnode) ptempnode->cmdwaitqwoken = 1; wake_up_interruptible(&ptempnode->cmdwait_q); ptempnode->status = 0; - ptempnode->cmd_oid = (u32) 0; ptempnode->wait_option = 0; ptempnode->pdata_buf = NULL; @@ -1683,21 +1682,19 @@ static void cleanup_cmdnode(struct cmd_ctrl_node *ptempnode) * * @param priv A pointer to struct lbs_private structure * @param ptempnode A pointer to cmd_ctrl_node structure - * @param cmd_oid cmd oid: treated as sub command * @param wait_option wait option: wait response or not * @param pdata_buf A pointer to informaion buffer * @return 0 or -1 */ void lbs_set_cmd_ctrl_node(struct lbs_private *priv, struct cmd_ctrl_node *ptempnode, - u32 cmd_oid, u16 wait_option, void *pdata_buf) + u16 wait_option, void *pdata_buf) { lbs_deb_enter(LBS_DEB_HOST); if (!ptempnode) return; - ptempnode->cmd_oid = cmd_oid; ptempnode->wait_option = wait_option; ptempnode->pdata_buf = pdata_buf; 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); void lbs_set_cmd_ctrl_node(struct lbs_private *priv, struct cmd_ctrl_node *ptempnode, - u32 cmd_oid, u16 wait_option, void *pdata_buf); + u16 wait_option, void *pdata_buf); int lbs_prepare_and_send_command(struct lbs_private *priv, 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 { /* CMD link list */ struct list_head list; u32 status; - /* CMD ID */ - u32 cmd_oid; /*CMD wait option: wait for finish or no wait */ u16 wait_option; /* command parameter */ |
