diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-05-12 14:06:10 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-12 14:06:10 -0400 |
| commit | 15cb309614f35df344b9f06a9ea9f077d1e449db (patch) | |
| tree | 85e244564f42381be5bf9d81ed867bb793fa976d /net/bluetooth/rfcomm/core.c | |
| parent | 4daf50f20256e0022c87c1609226e971a70c82fd (diff) | |
| parent | 55183d06cd1bd939ceccdad628b0aae12c86b803 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
Diffstat (limited to 'net/bluetooth/rfcomm/core.c')
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 121a5c13b98..5759bb7054f 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -2096,7 +2096,7 @@ static void rfcomm_security_cfm(struct hci_conn *conn, u8 status, u8 encrypt) if (!test_and_clear_bit(RFCOMM_AUTH_PENDING, &d->flags)) continue; - if (!status) + if (!status && hci_conn_check_secure(conn, d->sec_level)) set_bit(RFCOMM_AUTH_ACCEPT, &d->flags); else set_bit(RFCOMM_AUTH_REJECT, &d->flags); |