diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-05-16 13:08:20 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-05-16 13:08:20 +1000 |
commit | d0e419269484d6dcee4def5d8458d8bf7e774b4c (patch) | |
tree | 653a2a604c4917ac65f7aabacdddf9a9ca5544d3 /include | |
parent | a18043d0b532fbe31af37a7bfdc8017c049ef933 (diff) | |
parent | 2d4be98eec2b2f1e420e8935ee798f2d1c742cda (diff) |
Merge branch 'tmp'
Conflicts:
drivers/atm/ambassador.c
drivers/net/bonding/bond_main.c
drivers/net/bonding/bond_sysfs.c
Diffstat (limited to 'include')
-rw-r--r-- | include/net/bluetooth/hci_core.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index ea13baa3851b..5ebc33d300d2 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -25,6 +25,7 @@ #ifndef __HCI_CORE_H #define __HCI_CORE_H +#include <linux/mutex.h> #include <net/bluetooth/hci.h> /* HCI upper protocols */ @@ -115,7 +116,7 @@ struct hci_dev { struct sk_buff *sent_cmd; struct sk_buff *reassembly[3]; - struct semaphore req_lock; + struct mutex req_lock; wait_queue_head_t req_wait_q; __u32 req_status; __u32 req_result; @@ -657,8 +658,8 @@ struct hci_sec_filter { #define HCI_REQ_PEND 1 #define HCI_REQ_CANCELED 2 -#define hci_req_lock(d) down(&d->req_lock) -#define hci_req_unlock(d) up(&d->req_lock) +#define hci_req_lock(d) mutex_lock(&d->req_lock) +#define hci_req_unlock(d) mutex_unlock(&d->req_lock) void hci_req_complete(struct hci_dev *hdev, int result); |