2008-02-15 19:56:58

by Matthias Kaehlcke

Subject: [patch 3/3] Convert wpa_sem in a mutex

The semaphore wpa_sem is used as mutex, convert it to the mutex API

Signed-off-by: Matthias Kaehlcke <[email protected]>

Index: linux-2.6/drivers/net/wireless/prism54/isl_ioctl.c
===================================================================
--- linux-2.6.orig/drivers/net/wireless/prism54/isl_ioctl.c 2008-02-15 20:44:03.000000000 +0100
+++ linux-2.6/drivers/net/wireless/prism54/isl_ioctl.c 2008-02-15 20:44:11.000000000 +0100
@@ -2114,7 +2114,7 @@
if (wpa_ie_len > MAX_WPA_IE_LEN)
wpa_ie_len = MAX_WPA_IE_LEN;

- down(&priv->wpa_sem);
+ mutex_lock(&priv->wpa_lock);

/* try to use existing entry */
list_for_each(ptr, &priv->bss_wpa_list) {
@@ -2165,7 +2165,7 @@
kfree(bss);
}

- up(&priv->wpa_sem);
+ mutex_unlock(&priv->wpa_lock);
}

static size_t
@@ -2175,7 +2175,7 @@
struct islpci_bss_wpa_ie *bss = NULL;
size_t len = 0;

- down(&priv->wpa_sem);
+ mutex_lock(&priv->wpa_lock);

list_for_each(ptr, &priv->bss_wpa_list) {
bss = list_entry(ptr, struct islpci_bss_wpa_ie, list);
@@ -2187,7 +2187,7 @@
len = bss->wpa_ie_len;
memcpy(wpa_ie, bss->wpa_ie, len);
}
- up(&priv->wpa_sem);
+ mutex_unlock(&priv->wpa_lock);

return len;
}
@@ -2196,7 +2196,7 @@
prism54_wpa_bss_ie_init(islpci_private *priv)
{
INIT_LIST_HEAD(&priv->bss_wpa_list);
- sema_init(&priv->wpa_sem, 1);
+ mutex_init(&priv->wpa_lock);
}

void
Index: linux-2.6/drivers/net/wireless/prism54/islpci_dev.h
===================================================================
--- linux-2.6.orig/drivers/net/wireless/prism54/islpci_dev.h 2008-02-15 20:44:03.000000000 +0100
+++ linux-2.6/drivers/net/wireless/prism54/islpci_dev.h 2008-02-15 20:44:11.000000000 +0100
@@ -178,7 +178,7 @@
int wpa; /* WPA mode enabled */
struct list_head bss_wpa_list;
int num_bss_wpa;
- struct semaphore wpa_sem;
+ struct mutex wpa_lock;
u8 wpa_ie[MAX_WPA_IE_LEN];
size_t wpa_ie_len;


--
Matthias Kaehlcke
Linux System Developer
Barcelona

We build too many walls and not enough bridges
(Isaac Newton)
.''`.
using free software / Debian GNU/Linux | http://debian.org : :' :
`. `'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `-

2008-02-15 21:56:32

by Luis R. Rodriguez

Subject: Re: [patch 3/3] Convert wpa_sem in a mutex

On Fri, Feb 15, 2008 at 2:57 PM, <[email protected]> wrote:
> The semaphore wpa_sem is used as mutex, convert it to the mutex API
>
> Signed-off-by: Matthias Kaehlcke <[email protected]>

Acked-by: Luis R. Rodriguez <[email protected]>

Luis