From 531d689b8c6ff0b5d7ed142ecf1b61f589270051 Mon Sep 17 00:00:00 2001 From: Holger Schurig Date: Wed, 5 Dec 2007 17:58:06 +0100 Subject: [PATCH] --- yaml --- r: 79108 b: refs/heads/master c: 0d61d04210b617963c202a3c4dcbcd26a024d5d3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/cmd.c | 9 +++++++-- trunk/drivers/net/wireless/libertas/decl.h | 7 +------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 6abee1ad991a..5a1553d524b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c68b3bbdb596b5f82f1f0731f6fcb210735aff39 +refs/heads/master: 0d61d04210b617963c202a3c4dcbcd26a024d5d3 diff --git a/trunk/drivers/net/wireless/libertas/cmd.c b/trunk/drivers/net/wireless/libertas/cmd.c index 43dde7eec758..54ef990a46cc 100644 --- a/trunk/drivers/net/wireless/libertas/cmd.c +++ b/trunk/drivers/net/wireless/libertas/cmd.c @@ -13,6 +13,11 @@ #include "wext.h" static void cleanup_cmdnode(struct cmd_ctrl_node *ptempnode); +struct cmd_ctrl_node *lbs_get_cmd_ctrl_node(struct lbs_private *priv); +void lbs_set_cmd_ctrl_node(struct lbs_private *priv, + struct cmd_ctrl_node *ptempnode, + u16 wait_option, void *pdata_buf); + static u16 commands_allowed_in_ps[] = { CMD_802_11_RSSI, @@ -1220,7 +1225,7 @@ int lbs_prepare_and_send_command(struct lbs_private *priv, goto done; } - cmdnode = lbs_get_free_cmd_ctrl_node(priv); + cmdnode = lbs_get_cmd_ctrl_node(priv); if (cmdnode == NULL) { lbs_deb_host("PREP_CMD: cmdnode is NULL\n"); @@ -1623,7 +1628,7 @@ int lbs_free_cmd_buffer(struct lbs_private *priv) * @param priv A pointer to struct lbs_private structure * @return cmd_ctrl_node A pointer to cmd_ctrl_node structure or NULL */ -struct cmd_ctrl_node *lbs_get_free_cmd_ctrl_node(struct lbs_private *priv) +struct cmd_ctrl_node *lbs_get_cmd_ctrl_node(struct lbs_private *priv) { struct cmd_ctrl_node *tempnode; struct lbs_adapter *adapter = priv->adapter; diff --git a/trunk/drivers/net/wireless/libertas/decl.h b/trunk/drivers/net/wireless/libertas/decl.h index 201ec60f1dc5..0856cc96f513 100644 --- a/trunk/drivers/net/wireless/libertas/decl.h +++ b/trunk/drivers/net/wireless/libertas/decl.h @@ -15,18 +15,13 @@ struct lbs_private; struct lbs_adapter; struct sk_buff; struct net_device; +struct cmd_ctrl_node; int lbs_set_mac_packet_filter(struct lbs_private *priv); void lbs_send_tx_feedback(struct lbs_private *priv); int lbs_free_cmd_buffer(struct lbs_private *priv); -struct cmd_ctrl_node; -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, - u16 wait_option, void *pdata_buf); int lbs_prepare_and_send_command(struct lbs_private *priv, u16 cmd_no,