diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2005-01-13 04:35:52 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2005-01-13 04:35:52 -0800 |
| commit | d2b77f3ea736d4a3bb5f6c730aa0634b4fb3e5a4 (patch) | |
| tree | a352a4124600b7c70a09169d9e52f11e2b9b7703 /net | |
| parent | 715ea19db936987033dbec5395b991e359102269 (diff) | |
| parent | 1a19f183c915b256ec1e4dd458c72ef5f9e2e080 (diff) | |
| download | history-d2b77f3ea736d4a3bb5f6c730aa0634b4fb3e5a4.tar.gz | |
Merge http://linux-mh.bkbits.net/bluetooth-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hci_core.c | 6 | ||||
| -rw-r--r-- | net/bluetooth/rfcomm/tty.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 0380a1f19561e7..13e049bed8cd8a 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -59,15 +59,15 @@ static void hci_rx_task(unsigned long arg); static void hci_tx_task(unsigned long arg); static void hci_notify(struct hci_dev *hdev, int event); -static rwlock_t hci_task_lock = RW_LOCK_UNLOCKED; +static DEFINE_RWLOCK(hci_task_lock); /* HCI device list */ LIST_HEAD(hci_dev_list); -rwlock_t hci_dev_list_lock = RW_LOCK_UNLOCKED; +DEFINE_RWLOCK(hci_dev_list_lock); /* HCI callback list */ LIST_HEAD(hci_cb_list); -rwlock_t hci_cb_list_lock = RW_LOCK_UNLOCKED; +DEFINE_RWLOCK(hci_cb_list_lock); /* HCI protocols */ #define HCI_MAX_PROTO 2 diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c index 08907d32425e32..6d689200bcf3e9 100644 --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c @@ -77,7 +77,7 @@ struct rfcomm_dev { }; static LIST_HEAD(rfcomm_dev_list); -static rwlock_t rfcomm_dev_lock = RW_LOCK_UNLOCKED; +static DEFINE_RWLOCK(rfcomm_dev_lock); static void rfcomm_dev_data_ready(struct rfcomm_dlc *dlc, struct sk_buff *skb); static void rfcomm_dev_state_change(struct rfcomm_dlc *dlc, int err); |