diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-21 17:47:33 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-21 17:47:33 -0500 |
| commit | 4b0d1a0b1fd7248d0fc341d00ed908c7373c7788 (patch) | |
| tree | 7ba1dad63482c9a3d4461ec324aef9f909e73f49 /net/bluetooth/hci_conn.c | |
| parent | 8de65c2aaa1faf8e57e1b29b4265b6a57fae4136 (diff) | |
| parent | a9802d43f205faa2fff422502a1336a50b9615c3 (diff) | |
| download | linux-4b0d1a0b1fd7248d0fc341d00ed908c7373c7788.tar.bz2 | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'net/bluetooth/hci_conn.c')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 3db432473ad5..07bc69ed9498 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -635,6 +635,10 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->pend)) { struct hci_cp_auth_requested cp; + + /* encrypt must be pending if auth is also pending */ + set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend); + cp.handle = cpu_to_le16(conn->handle); hci_send_cmd(conn->hdev, HCI_OP_AUTH_REQUESTED, sizeof(cp), &cp); |