leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prism54: Convert mgmt_sem to the mutex API

Browse Source 
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Matthias Kaehlcke 2007-11-05 09:41:01 +01:00 committed by David S. Miller
parent 1e3428e9e3
commit 1b34fd390c
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/prism54/islpci_dev.c
View File

@ -861,7 +861,7 @@ islpci_setup(struct pci_dev *pdev)
init_waitqueue_head(&priv->reset_done); init_waitqueue_head(&priv->reset_done);
/* init the queue read locks, process wait counter */ /* init the queue read locks, process wait counter */
sema_init(&priv->mgmt_sem, 1); mutex_init(&priv->mgmt_lock);
priv->mgmt_received = NULL; priv->mgmt_received = NULL;
init_waitqueue_head(&priv->mgmt_wqueue); init_waitqueue_head(&priv->mgmt_wqueue);
sema_init(&priv->stats_sem, 1); sema_init(&priv->stats_sem, 1);

3
drivers/net/wireless/prism54/islpci_dev.h
View File

@ -26,6 +26,7 @@
#include <linux/wireless.h> #include <linux/wireless.h>
#include <net/iw_handler.h> #include <net/iw_handler.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/mutex.h>
#include "isl_38xx.h" #include "isl_38xx.h"
#include "isl_oid.h" #include "isl_oid.h"
@ -164,7 +165,7 @@ typedef struct {
wait_queue_head_t reset_done; wait_queue_head_t reset_done;
/* used by islpci_mgt_transaction */ /* used by islpci_mgt_transaction */
struct semaphore mgmt_sem; /* serialize access to mailbox and wqueue */ struct mutex mgmt_lock; /* serialize access to mailbox and wqueue */
struct islpci_mgmtframe *mgmt_received; /* mbox for incoming frame */ struct islpci_mgmtframe *mgmt_received; /* mbox for incoming frame */
wait_queue_head_t mgmt_wqueue; /* waitqueue for mbox */ wait_queue_head_t mgmt_wqueue; /* waitqueue for mbox */

4
drivers/net/wireless/prism54/islpci_mgt.c
View File

@ -460,7 +460,7 @@ islpci_mgt_transaction(struct net_device *ndev,
*recvframe = NULL; *recvframe = NULL;
if (down_interruptible(&priv->mgmt_sem)) if (mutex_lock_interruptible(&priv->mgmt_lock))
return -ERESTARTSYS; return -ERESTARTSYS;
prepare_to_wait(&priv->mgmt_wqueue, &wait, TASK_UNINTERRUPTIBLE); prepare_to_wait(&priv->mgmt_wqueue, &wait, TASK_UNINTERRUPTIBLE);
@ -504,7 +504,7 @@ islpci_mgt_transaction(struct net_device *ndev,
/* TODO: we should reset the device here */ /* TODO: we should reset the device here */
out: out:
finish_wait(&priv->mgmt_wqueue, &wait); finish_wait(&priv->mgmt_wqueue, &wait);
up(&priv->mgmt_sem); mutex_unlock(&priv->mgmt_lock);
return err; return err;
} }