diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-09 02:11:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-09 02:11:11 -0700 |
| commit | fd9ec7d31ffc36917dc7cac0fd0435f587a572d4 (patch) | |
| tree | 844da38556f1334959d47bab1d04d0937df8efa5 /net/bluetooth/hci_event.c | |
| parent | 82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff) | |
| parent | e7c29cb16c833441fd2160642bb13025f4e7ac70 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
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); |