diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-06-17 14:08:47 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-06-17 14:08:47 -0400 |
| commit | 7f4dbaa3aeff6ccf0a7c854ece4df4d69907eb64 (patch) | |
| tree | 82a0f6e68d02a0d275351992d022a61ab5ccfb75 /net/bluetooth/hci_conn.c | |
| parent | 740bb82b7655770c09a19af5528a131ac741eaf1 (diff) | |
| parent | 92d1372e1a9fec00e146b74e8b9ad7a385b9b37f (diff) | |
| download | talos-op-linux-7f4dbaa3aeff6ccf0a7c854ece4df4d69907eb64.tar.gz talos-op-linux-7f4dbaa3aeff6ccf0a7c854ece4df4d69907eb64.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'net/bluetooth/hci_conn.c')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 8671bc79a35b..ca01d1861854 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -610,11 +610,6 @@ static void hci_req_add_le_create_conn(struct hci_request *req, if (hci_update_random_address(req, false, &own_addr_type)) return; - /* Save the address type used for this connnection attempt so we able - * to retrieve this information if we need it. - */ - conn->src_type = own_addr_type; - cp.scan_interval = cpu_to_le16(hdev->le_scan_interval); cp.scan_window = cpu_to_le16(hdev->le_scan_window); bacpy(&cp.peer_addr, &conn->dst); @@ -894,7 +889,7 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) /* If we're already encrypted set the REAUTH_PEND flag, * otherwise set the ENCRYPT_PEND. */ - if (conn->key_type != 0xff) + if (conn->link_mode & HCI_LM_ENCRYPT) set_bit(HCI_CONN_REAUTH_PEND, &conn->flags); else set_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags); |
