Messages in this thread Patch in this message | | | Date | Mon, 24 May 2004 04:33:38 -0400 | From | "Luis R. Rodriguez" <> | Subject | [PATCH 11/14 linux-2.6.7-rc1] prism54: Touched up kernel compatibility |
| |
2004-04-20 Aurelien Alleaume <slts@free.fr>
* prismcompat.h, prismcompat24.h: splitted PRISM_DEFWAITQ into PRISM_DEFWAITQ and PRISM_PREPWAITQ for islpci_mgt_transaction (islpci_mgt.c). Adapted related code (islpci_mgt.c, islpci_dev.c). -- GnuPG Key fingerprint = 113F B290 C6D2 0251 4D84 A34A 6ADD 4937 E20A 525E 2004-04-20 Aurelien Alleaume <slts@free.fr>
* prismcompat.h, prismcompat24.h: splitted PRISM_DEFWAITQ into PRISM_DEFWAITQ and PRISM_PREPWAITQ for islpci_mgt_transaction (islpci_mgt.c). Adapted related code (islpci_mgt.c, islpci_dev.c).
Index: linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_dev.c =================================================================== RCS file: /var/lib/cvs/prism54-ng/ksrc/islpci_dev.c,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_dev.c 17 Apr 2004 08:46:04 -0000 1.75 +++ linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_dev.c 19 Apr 2004 18:33:45 -0000 1.76 @@ -1,4 +1,4 @@ -/* $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_dev.c,v 1.75 2004/04/17 08:46:04 ajfa Exp $ +/* $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_dev.c,v 1.76 2004/04/19 18:33:45 ajfa Exp $ * * Copyright (C) 2002 Intersil Americas Inc. * Copyright (C) 2003 Herbert Valerio Riedel <hvr@gnu.org> @@ -348,7 +348,8 @@ int result = -ETIME; int count; - PRISM_DEFWAITQ(priv->reset_done, wait); + PRISM_DEFWAITQ(wait); + PRISM_PREPWAITQ(priv->reset_done, wait); /* now the last step is to reset the interface */ isl38xx_interface_reset(priv->device_base, priv->device_host_address); Index: linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_mgt.c =================================================================== RCS file: /var/lib/cvs/prism54-ng/ksrc/islpci_mgt.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_mgt.c 10 Apr 2004 03:16:55 -0000 1.45 +++ linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_mgt.c 19 Apr 2004 18:33:45 -0000 1.46 @@ -1,4 +1,4 @@ -/* $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_mgt.c,v 1.45 2004/04/10 03:16:55 msw Exp $ +/* $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_mgt.c,v 1.46 2004/04/19 18:33:45 ajfa Exp $ * * Copyright (C) 2002 Intersil Americas Inc. * Copyright 2004 Jens Maurer <Jens.Maurer@gmx.net> @@ -456,11 +456,12 @@ const long wait_cycle_jiffies = (ISL38XX_WAIT_CYCLE * 10 * HZ) / 1000; long timeout_left = ISL38XX_MAX_WAIT_CYCLES * wait_cycle_jiffies; int err; + PRISM_DEFWAITQ(wait); if (down_interruptible(&priv->mgmt_sem)) return -ERESTARTSYS; - PRISM_DEFWAITQ(priv->mgmt_wqueue, wait); + PRISM_PREPWAITQ(priv->mgmt_wqueue, wait); err = islpci_mgt_transmit(ndev, operation, oid, senddata, sendlen); if (err) goto out; Index: linux-2.6.7-rc1/drivers/net/wireless/prism54/prismcompat.h =================================================================== RCS file: /var/lib/cvs/prism54-ng/ksrc/prismcompat.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6.7-rc1/drivers/net/wireless/prism54/prismcompat.h 5 Apr 2004 04:19:25 -0000 1.2 +++ linux-2.6.7-rc1/drivers/net/wireless/prism54/prismcompat.h 19 Apr 2004 18:33:45 -0000 1.3 @@ -39,8 +39,9 @@ #define prism54_synchronize_irq(irq) synchronize_irq(irq) -#define PRISM_DEFWAITQ(x, y) DEFINE_WAIT(y); \ - prepare_to_wait(&(x), &(y), TASK_UNINTERRUPTIBLE) +#define PRISM_DEFWAITQ(y) DEFINE_WAIT(y) + +#define PRISM_PREPWAITQ(x, y) prepare_to_wait(&(x), &(y), TASK_UNINTERRUPTIBLE) #define PRISM_ENDWAITQ(x, y) finish_wait(&(x), &(y)) Index: linux-2.6.7-rc1/drivers/net/wireless/prism54/prismcompat24.h =================================================================== RCS file: /var/lib/cvs/prism54-ng/ksrc/prismcompat24.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6.7-rc1/drivers/net/wireless/prism54/prismcompat24.h 13 Apr 2004 08:20:13 -0000 1.2 +++ linux-2.6.7-rc1/drivers/net/wireless/prism54/prismcompat24.h 19 Apr 2004 18:33:45 -0000 1.3 @@ -55,8 +55,8 @@ #define prism54_synchronize_irq(irq) synchronize_irq() -#define PRISM_DEFWAITQ(x, y) DECLARE_WAITQUEUE(y, current); \ - set_current_state(TASK_UNINTERRUPTIBLE); \ +#define PRISM_DEFWAITQ(y) DECLARE_WAITQUEUE(y, current) +#define PRISM_PREPWAITQ(x, y) set_current_state(TASK_UNINTERRUPTIBLE); \ add_wait_queue(&(x), &(y)) #define PRISM_ENDWAITQ(x, y) remove_wait_queue(&(x), &(y)); \[unhandled content-type:application/pgp-signature]
| |