diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-15 20:59:34 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-15 20:59:34 -0800 |
| commit | eaa04dc353f45404be54a61b48a3f97de12fafc3 (patch) | |
| tree | 633b044f974327a95225b4787a9ada24cf9f33cb /net/bluetooth/hci_conn.c | |
| parent | 8812304cf1110ae16b0778680f6022216cf4716a (diff) | |
| parent | 68ae6639b6dff117ba37f648f1611a4629abadf0 (diff) | |
| download | kernel_samsung_smdk4412-eaa04dc353f45404be54a61b48a3f97de12fafc3.tar.gz kernel_samsung_smdk4412-eaa04dc353f45404be54a61b48a3f97de12fafc3.tar.bz2 kernel_samsung_smdk4412-eaa04dc353f45404be54a61b48a3f97de12fafc3.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'net/bluetooth/hci_conn.c')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index a9750984f77..b7c4224f4e7 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -211,6 +211,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst) conn->type = type; conn->mode = HCI_CM_ACTIVE; conn->state = BT_OPEN; + conn->auth_type = HCI_AT_GENERAL_BONDING; conn->power_save = 1; conn->disc_timeout = HCI_DISCONN_TIMEOUT; |