diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-16 21:59:13 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-16 21:59:13 +0400 |
| commit | 26c6e80892d8c160dffaba85889bd4e65b1dacf6 (patch) | |
| tree | 0d7751d80ac44b9407270be246f83e8354fc26ba /net/bluetooth/smp.c | |
| parent | 6fc4adca6ce3e1d57a42707019dddcb883578a91 (diff) | |
| parent | d61f978b8f26d2392c88249f877e46e2c2b5561d (diff) | |
| download | linux-26c6e80892d8c160dffaba85889bd4e65b1dacf6.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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 2ac8d50861e0..a5923378bdf0 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); |