* [PATCH] Prism54: Convert mgmt_sem to the mutex API @ 2007-11-01 7:19 Matthias Kaehlcke 2007-11-04 23:36 ` Michael Buesch 0 siblings, 1 reply; 3+ messages in thread From: Matthias Kaehlcke @ 2007-11-01 7:19 UTC (permalink / raw) To: mcgrof, linux-wireless; +Cc: linux-kernel, Andrew Morton Prism54: Convert mgmt_sem to the mutex API Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com> -- diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c index 219dd65..dbb538c 100644 --- a/drivers/net/wireless/prism54/islpci_dev.c +++ b/drivers/net/wireless/prism54/islpci_dev.c @@ -861,7 +861,7 @@ islpci_setup(struct pci_dev *pdev) init_waitqueue_head(&priv->reset_done); /* init the queue read locks, process wait counter */ - sema_init(&priv->mgmt_sem, 1); + mutex_init(&priv->mgmt_lock); priv->mgmt_received = NULL; init_waitqueue_head(&priv->mgmt_wqueue); sema_init(&priv->stats_sem, 1); diff --git a/drivers/net/wireless/prism54/islpci_dev.h b/drivers/net/wireless/prism54/islpci_dev.h index 736666d..4e0182c 100644 --- a/drivers/net/wireless/prism54/islpci_dev.h +++ b/drivers/net/wireless/prism54/islpci_dev.h @@ -26,6 +26,7 @@ #include <linux/wireless.h> #include <net/iw_handler.h> #include <linux/list.h> +#include <linux/mutex.h> #include "isl_38xx.h" #include "isl_oid.h" @@ -164,7 +165,7 @@ typedef struct { wait_queue_head_t reset_done; /* 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 */ wait_queue_head_t mgmt_wqueue; /* waitqueue for mbox */ -- Matthias Kaehlcke Linux Application Developer Barcelona The yellow ships hung in the air just like bricks dont do (The Hitch-Hiker's Guide to the Galaxy) .''`. using free software / Debian GNU/Linux | http://debian.org : :' : `. `'` gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `- ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Prism54: Convert mgmt_sem to the mutex API 2007-11-01 7:19 [PATCH] Prism54: Convert mgmt_sem to the mutex API Matthias Kaehlcke @ 2007-11-04 23:36 ` Michael Buesch 2007-11-05 8:41 ` Matthias Kaehlcke 0 siblings, 1 reply; 3+ messages in thread From: Michael Buesch @ 2007-11-04 23:36 UTC (permalink / raw) To: Matthias Kaehlcke; +Cc: mcgrof, linux-wireless, linux-kernel, Andrew Morton On Thursday 01 November 2007 08:19:02 Matthias Kaehlcke wrote: > Prism54: Convert mgmt_sem to the mutex API > > Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com> > > -- > > diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c > index 219dd65..dbb538c 100644 > --- a/drivers/net/wireless/prism54/islpci_dev.c > +++ b/drivers/net/wireless/prism54/islpci_dev.c > @@ -861,7 +861,7 @@ islpci_setup(struct pci_dev *pdev) > init_waitqueue_head(&priv->reset_done); > > /* init the queue read locks, process wait counter */ > - sema_init(&priv->mgmt_sem, 1); > + mutex_init(&priv->mgmt_lock); > priv->mgmt_received = NULL; > init_waitqueue_head(&priv->mgmt_wqueue); > sema_init(&priv->stats_sem, 1); > diff --git a/drivers/net/wireless/prism54/islpci_dev.h b/drivers/net/wireless/prism54/islpci_dev.h > index 736666d..4e0182c 100644 > --- a/drivers/net/wireless/prism54/islpci_dev.h > +++ b/drivers/net/wireless/prism54/islpci_dev.h > @@ -26,6 +26,7 @@ > #include <linux/wireless.h> > #include <net/iw_handler.h> > #include <linux/list.h> > +#include <linux/mutex.h> > > #include "isl_38xx.h" > #include "isl_oid.h" > @@ -164,7 +165,7 @@ typedef struct { > wait_queue_head_t reset_done; > > /* 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 */ > wait_queue_head_t mgmt_wqueue; /* waitqueue for mbox */ > Uhm, so this mutex is not used? Why not remove it then? -- Greetings Michael. ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Prism54: Convert mgmt_sem to the mutex API 2007-11-04 23:36 ` Michael Buesch @ 2007-11-05 8:41 ` Matthias Kaehlcke 0 siblings, 0 replies; 3+ messages in thread From: Matthias Kaehlcke @ 2007-11-05 8:41 UTC (permalink / raw) To: Michael Buesch; +Cc: mcgrof, linux-wireless, linux-kernel, Andrew Morton El Mon, Nov 05, 2007 at 12:36:13AM +0100 Michael Buesch ha dit: > On Thursday 01 November 2007 08:19:02 Matthias Kaehlcke wrote: > > Prism54: Convert mgmt_sem to the mutex API > > > > Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com> > > > > Uhm, so this mutex is not used? Why not remove it then? i apologize, the patch i submitted is incorrect, a file is missing. here is the correct version -- Prism54: Convert mgmt_sem to the mutex API Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com> -- diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c index 219dd65..dbb538c 100644 --- a/drivers/net/wireless/prism54/islpci_dev.c +++ b/drivers/net/wireless/prism54/islpci_dev.c @@ -861,7 +861,7 @@ islpci_setup(struct pci_dev *pdev) init_waitqueue_head(&priv->reset_done); /* init the queue read locks, process wait counter */ - sema_init(&priv->mgmt_sem, 1); + mutex_init(&priv->mgmt_lock); priv->mgmt_received = NULL; init_waitqueue_head(&priv->mgmt_wqueue); sema_init(&priv->stats_sem, 1); diff --git a/drivers/net/wireless/prism54/islpci_dev.h b/drivers/net/wireless/prism54/islpci_dev.h index 736666d..4e0182c 100644 --- a/drivers/net/wireless/prism54/islpci_dev.h +++ b/drivers/net/wireless/prism54/islpci_dev.h @@ -26,6 +26,7 @@ #include <linux/wireless.h> #include <net/iw_handler.h> #include <linux/list.h> +#include <linux/mutex.h> #include "isl_38xx.h" #include "isl_oid.h" @@ -164,7 +165,7 @@ typedef struct { wait_queue_head_t reset_done; /* 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 */ wait_queue_head_t mgmt_wqueue; /* waitqueue for mbox */ diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c index 2246f79..f7c677e 100644 --- a/drivers/net/wireless/prism54/islpci_mgt.c +++ b/drivers/net/wireless/prism54/islpci_mgt.c @@ -460,7 +460,7 @@ islpci_mgt_transaction(struct net_device *ndev, *recvframe = NULL; - if (down_interruptible(&priv->mgmt_sem)) + if (mutex_lock_interruptible(&priv->mgmt_lock)) return -ERESTARTSYS; 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 */ out: finish_wait(&priv->mgmt_wqueue, &wait); - up(&priv->mgmt_sem); + mutex_unlock(&priv->mgmt_lock); return err; } -- Matthias Kaehlcke Linux Application Developer Barcelona La guerra es un acto abominable en el que se matan personas que no se conocen, dirigidas por personas que se conocen y no se matan .''`. using free software / Debian GNU/Linux | http://debian.org : :' : `. `'` gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `- ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-11-05 8:41 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2007-11-01 7:19 [PATCH] Prism54: Convert mgmt_sem to the mutex API Matthias Kaehlcke 2007-11-04 23:36 ` Michael Buesch 2007-11-05 8:41 ` Matthias Kaehlcke
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox