2007-12-05 16:57:39

by Holger Schurig

[permalink] [raw]
Subject: [PATCH 2/5] libertas: remove cmd_ctrl_node->cmdflags

There was no code that ever did set this flag.

Signed-off-by: Holger Schurig <[email protected]>


Index: wireless-2.6/drivers/net/wireless/libertas/cmdresp.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- wireless-2.6.orig/drivers/net/wireless/libertas/cmdresp.c 2007-12-0=
5 14:50:37.000000000 +0100
+++ wireless-2.6/drivers/net/wireless/libertas/cmdresp.c 2007-12-05 17:=
59:51.000000000 +0100
@@ -856,13 +856,6 @@ int lbs_process_rx_command(struct lbs_pr
goto done;
}
=20
- if (adapter->cur_cmd->cmdflags & CMD_F_HOSTCMD) {
- /* Copy the response back to response buffer */
- memcpy(adapter->cur_cmd->pdata_buf, resp,
- le16_to_cpu(resp->size));
- adapter->cur_cmd->cmdflags &=3D ~CMD_F_HOSTCMD;
- }
-
/* If the command is not successful, cleanup and return failure */
if ((result !=3D 0 || !(respcmd & 0x8000))) {
lbs_deb_host("CMD_RESP: error 0x%04x in command reply 0x%04x\n",
Index: wireless-2.6/drivers/net/wireless/libertas/hostcmd.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- wireless-2.6.orig/drivers/net/wireless/libertas/hostcmd.h 2007-12-0=
5 14:50:37.000000000 +0100
+++ wireless-2.6/drivers/net/wireless/libertas/hostcmd.h 2007-12-05 17:=
59:51.000000000 +0100
@@ -75,7 +75,6 @@ struct cmd_ctrl_node {
void *pdata_buf;
/*command data */
u8 *bufvirtualaddr;
- u16 cmdflags;
/* wait queue */
u16 cmdwaitqwoken;
wait_queue_head_t cmdwait_q;

--=20
M&N Solutions GmbH Ein Unternehmen der Datagroup AG
Holger Schurig
Raiffeisenstr. 10 ACHTUNG: die Stra=DFe hat sich ge=E4ndert
61191 Rosbach
Tel: 06003/9141-15 Fax 06003/9141-49
http://www.mn-solutions.de/

Handelsregister Friedberg, HRB 5903
Gesch=E4ftsf=FChrer: H.Herzig, P.Schrittenlocher