summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-07-28 16:17:49 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-07-28 16:17:49 -0400
commit099284bdecf6e0af78662371ed3f45b71d796aad (patch)
tree90c336885d8dd6daf46ea4b94f71bb8f986b5ba9 /include/net
parent073730d771d97bb5bbef080bd5d6d0a5af7cba7d (diff)
parent4ebaa4edf8799cab19d5a0642dc95f04fd284e06 (diff)
downloadlinux-099284bdecf6e0af78662371ed3f45b71d796aad.tar.gz
linux-099284bdecf6e0af78662371ed3f45b71d796aad.tar.bz2
linux-099284bdecf6e0af78662371ed3f45b71d796aad.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'include/net')
-rw-r--r--include/net/bluetooth/hci_core.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 350b3e6964bd..8b28962e737e 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -256,6 +256,7 @@ enum {
HCI_CONN_ENCRYPT_PEND,
HCI_CONN_RSWITCH_PEND,
HCI_CONN_MODE_CHANGE_PEND,
+ HCI_CONN_SCO_SETUP_PEND,
};
static inline void hci_conn_hash_init(struct hci_dev *hdev)
@@ -336,6 +337,7 @@ void hci_acl_connect(struct hci_conn *conn);
void hci_acl_disconn(struct hci_conn *conn, __u8 reason);
void hci_add_sco(struct hci_conn *conn, __u16 handle);
void hci_setup_sync(struct hci_conn *conn, __u16 handle);
+void hci_sco_setup(struct hci_conn *conn, __u8 status);
struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst);
int hci_conn_del(struct hci_conn *conn);