diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-10 04:28:03 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-10 04:28:03 +0200 |
| commit | 47abf28d5b36521558a848a346064a3a3c82bd9e (patch) | |
| tree | 736e9402b52f08210b8c4bdda9d214e98a6bf7de /include | |
| parent | ipsec: Make xfrm_larval_drop default to 1. (diff) | |
| parent | ipv6: Fix OOPS in ip6_dst_lookup_tail(). (diff) | |
| download | linux-47abf28d5b36521558a848a346064a3a3c82bd9e.tar.xz linux-47abf28d5b36521558a848a346064a3a3c82bd9e.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index cbf751094688..46a43b721dd6 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); |