diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-14 14:17:58 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-14 14:17:58 -0500 |
| commit | 485f2b7f5fd30f30a781d68b6190d6b293977d83 (patch) | |
| tree | 8d6dd1b93fb216cfb6b377402e06c557e0cb8b53 /net/bluetooth/smp.c | |
| parent | e734207fee61a76645ea3b3348180226ee4bc54e (diff) | |
| parent | 482049f75750d73358e65236b933417b69f9cc25 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'net/bluetooth/smp.c')
| -rw-r--r-- | net/bluetooth/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 2ac8d50861e..a5923378bdf 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -267,7 +267,7 @@ static void smp_failure(struct l2cap_conn *conn, u8 reason, u8 send) clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->hcon->flags); mgmt_auth_failed(conn->hcon->hdev, conn->dst, hcon->type, - hcon->dst_type, reason); + hcon->dst_type, HCI_ERROR_AUTH_FAILURE); cancel_delayed_work_sync(&conn->security_timer); |