diff options
author | Holger Schurig <h.schurig@mn-solutions.de> | 2007-12-05 11:57:56 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:06:01 -0500 |
commit | 891f32a1c4fe5c57f15873fa1d9fff425b30ab4d (patch) | |
tree | ce1c2b91f8cf2f0c4daa39c585bb0a8c0e53391c | |
parent | e775ed7c677b163c80643036c32e23d3e59b9429 (diff) |
libertas: remove cmd_ctrl_node->cmdflags
There was no code that ever did set this flag.
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/libertas/cmdresp.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/hostcmd.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c index 90f1c4974fa7..cbd28ee7c5b8 100644 --- a/drivers/net/wireless/libertas/cmdresp.c +++ b/drivers/net/wireless/libertas/cmdresp.c | |||
@@ -856,13 +856,6 @@ int lbs_process_rx_command(struct lbs_private *priv) | |||
856 | goto done; | 856 | goto done; |
857 | } | 857 | } |
858 | 858 | ||
859 | if (adapter->cur_cmd->cmdflags & CMD_F_HOSTCMD) { | ||
860 | /* Copy the response back to response buffer */ | ||
861 | memcpy(adapter->cur_cmd->pdata_buf, resp, | ||
862 | le16_to_cpu(resp->size)); | ||
863 | adapter->cur_cmd->cmdflags &= ~CMD_F_HOSTCMD; | ||
864 | } | ||
865 | |||
866 | /* If the command is not successful, cleanup and return failure */ | 859 | /* If the command is not successful, cleanup and return failure */ |
867 | if ((result != 0 || !(respcmd & 0x8000))) { | 860 | if ((result != 0 || !(respcmd & 0x8000))) { |
868 | lbs_deb_host("CMD_RESP: error 0x%04x in command reply 0x%04x\n", | 861 | lbs_deb_host("CMD_RESP: error 0x%04x in command reply 0x%04x\n", |
diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h index c02914900755..217ae122fca9 100644 --- a/drivers/net/wireless/libertas/hostcmd.h +++ b/drivers/net/wireless/libertas/hostcmd.h | |||
@@ -75,7 +75,6 @@ struct cmd_ctrl_node { | |||
75 | void *pdata_buf; | 75 | void *pdata_buf; |
76 | /*command data */ | 76 | /*command data */ |
77 | u8 *bufvirtualaddr; | 77 | u8 *bufvirtualaddr; |
78 | u16 cmdflags; | ||
79 | /* wait queue */ | 78 | /* wait queue */ |
80 | u16 cmdwaitqwoken; | 79 | u16 cmdwaitqwoken; |
81 | wait_queue_head_t cmdwait_q; | 80 | wait_queue_head_t cmdwait_q; |