Skip to content

Commit

Permalink
staging: brcm80211: use mutex instead of semaphore in dhd_linux.c
Browse files Browse the repository at this point in the history
The semaphore proto_sem has been replaced with mutex proto_block
which lock certain code paths for one thread.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed Aug 23, 2011
1 parent 49552d3 commit 26f1283
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/staging/brcm80211/brcmfmac/dhd_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
#include <linux/fcntl.h>
#include <linux/fs.h>
#include <linux/uaccess.h>
#include <linux/interrupt.h>
#include <linux/hardirq.h>
#include <linux/mutex.h>
#include <net/cfg80211.h>
#include <defs.h>
#include <brcmu_utils.h>
Expand Down Expand Up @@ -75,7 +75,7 @@ struct brcmf_info {
/* OS/stack specifics */
struct brcmf_if *iflist[BRCMF_MAX_IFS];

struct semaphore proto_sem;
struct mutex proto_block;
wait_queue_head_t ioctl_resp_wait;

/* Thread to issue ioctl for multicast */
Expand Down Expand Up @@ -1314,7 +1314,7 @@ struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen)
goto fail;

net->netdev_ops = NULL;
sema_init(&drvr_priv->proto_sem, 1);
mutex_init(&drvr_priv->proto_block);
/* Initialize other structure content */
init_waitqueue_head(&drvr_priv->ioctl_resp_wait);

Expand Down Expand Up @@ -1584,7 +1584,7 @@ int brcmf_os_proto_block(struct brcmf_pub *drvr)
struct brcmf_info *drvr_priv = drvr->info;

if (drvr_priv) {
down(&drvr_priv->proto_sem);
mutex_lock(&drvr_priv->proto_block);
return 1;
}
return 0;
Expand All @@ -1595,7 +1595,7 @@ int brcmf_os_proto_unblock(struct brcmf_pub *drvr)
struct brcmf_info *drvr_priv = drvr->info;

if (drvr_priv) {
up(&drvr_priv->proto_sem);
mutex_unlock(&drvr_priv->proto_block);
return 1;
}

Expand Down

0 comments on commit 26f1283

Please sign in to comment.