summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-09-09 02:11:11 -0700
committerDavid S. Miller <davem@davemloft.net>2008-09-09 02:11:11 -0700
commitfd9ec7d31ffc36917dc7cac0fd0435f587a572d4 (patch)
tree844da38556f1334959d47bab1d04d0937df8efa5 /include
parent82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff)
parente7c29cb16c833441fd2160642bb13025f4e7ac70 (diff)
downloadop-kernel-dev-fd9ec7d31ffc36917dc7cac0fd0435f587a572d4.zip
op-kernel-dev-fd9ec7d31ffc36917dc7cac0fd0435f587a572d4.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'include')
-rw-r--r--include/net/bluetooth/hci_core.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index cbf7510..46a43b7 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -325,7 +325,8 @@ int hci_conn_del(struct hci_conn *conn);
void hci_conn_hash_flush(struct hci_dev *hdev);
void hci_conn_check_pending(struct hci_dev *hdev);
-struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *src);
+struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8 auth_type);
+int hci_conn_check_link_mode(struct hci_conn *conn);
int hci_conn_auth(struct hci_conn *conn);
int hci_conn_encrypt(struct hci_conn *conn);
int hci_conn_change_link_key(struct hci_conn *conn);
OpenPOWER on IntegriCloud