openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
David Woodhouse 2007-12-01 15:15:41 +00:00 committed by David S. Miller
parent 77d8cf2c09
commit f5ece8fc8d
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/wireless/libertas/cmd.c
View File

@ -1231,7 +1231,7 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
goto done; 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; 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: case CMD_802_11_INACTIVITY_TIMEOUT:
ret = lbs_cmd_802_11_inactivity_timeout(priv, cmdptr, ret = lbs_cmd_802_11_inactivity_timeout(priv, cmdptr,
cmd_action, pdata_buf); 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; break;
case CMD_802_11_TPC_CFG: case CMD_802_11_TPC_CFG:
@ -1668,7 +1668,6 @@ static void cleanup_cmdnode(struct cmd_ctrl_node *ptempnode)
ptempnode->cmdwaitqwoken = 1; ptempnode->cmdwaitqwoken = 1;
wake_up_interruptible(&ptempnode->cmdwait_q); wake_up_interruptible(&ptempnode->cmdwait_q);
ptempnode->status = 0; ptempnode->status = 0;
ptempnode->cmd_oid = (u32) 0;
ptempnode->wait_option = 0; ptempnode->wait_option = 0;
ptempnode->pdata_buf = NULL; 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 priv A pointer to struct lbs_private structure
* @param ptempnode A pointer to cmd_ctrl_node 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 wait_option wait option: wait response or not
* @param pdata_buf A pointer to informaion buffer * @param pdata_buf A pointer to informaion buffer
* @return 0 or -1 * @return 0 or -1
*/ */
void lbs_set_cmd_ctrl_node(struct lbs_private *priv, void lbs_set_cmd_ctrl_node(struct lbs_private *priv,
struct cmd_ctrl_node *ptempnode, 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); lbs_deb_enter(LBS_DEB_HOST);
if (!ptempnode) if (!ptempnode)
return; return;
ptempnode->cmd_oid = cmd_oid;
ptempnode->wait_option = wait_option; ptempnode->wait_option = wait_option;
ptempnode->pdata_buf = pdata_buf; ptempnode->pdata_buf = pdata_buf;

2
drivers/net/wireless/libertas/decl.h
View File

@ -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, void lbs_set_cmd_ctrl_node(struct lbs_private *priv,
struct cmd_ctrl_node *ptempnode, 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, int lbs_prepare_and_send_command(struct lbs_private *priv,
u16 cmd_no, u16 cmd_no,

2
drivers/net/wireless/libertas/hostcmd.h
View File

@ -69,8 +69,6 @@ struct cmd_ctrl_node {
/* CMD link list */ /* CMD link list */
struct list_head list; struct list_head list;
u32 status; u32 status;
/* CMD ID */
u32 cmd_oid;
/*CMD wait option: wait for finish or no wait */ /*CMD wait option: wait for finish or no wait */
u16 wait_option; u16 wait_option;
/* command parameter */ /* command parameter */