diff options
| author | Ingo Molnar | 2008-09-14 17:23:29 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-09-14 17:23:29 +0200 |
| commit | 9dfed08eb4086584205717894177a9ee930c88c4 (patch) | |
| tree | 3455b242f0e85a86d836858a86bd6ffd21279e22 /net/bluetooth/hci_event.c | |
| parent | IO resources: fix/remove printk (diff) | |
| parent | Linux 2.6.27-rc6 (diff) | |
| download | kernel-qcow2-linux-9dfed08eb4086584205717894177a9ee930c88c4.tar.gz kernel-qcow2-linux-9dfed08eb4086584205717894177a9ee930c88c4.tar.xz kernel-qcow2-linux-9dfed08eb4086584205717894177a9ee930c88c4.zip | |
Merge commit 'v2.6.27-rc6' into core/resources
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 0e3db289f4be..ad7a553d7713 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1605,14 +1605,11 @@ static inline void hci_remote_ext_features_evt(struct hci_dev *hdev, struct sk_b if (conn->state == BT_CONFIG) { if (!ev->status && hdev->ssp_mode > 0 && - conn->ssp_mode > 0) { - if (conn->out) { - struct hci_cp_auth_requested cp; - cp.handle = ev->handle; - hci_send_cmd(hdev, - HCI_OP_AUTH_REQUESTED, + conn->ssp_mode > 0 && conn->out) { + struct hci_cp_auth_requested cp; + cp.handle = ev->handle; + hci_send_cmd(hdev, HCI_OP_AUTH_REQUESTED, sizeof(cp), &cp); - } } else { conn->state = BT_CONNECTED; hci_proto_connect_cfm(conn, ev->status); |