Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 322763
b: refs/heads/master
c: d8343f1
h: refs/heads/master
i:
  322761: e12ac05
  322759: 2fb39dc
v: v3
  • Loading branch information
Vinicius Costa Gomes authored and Gustavo Padovan committed Aug 27, 2012
1 parent 918bee6 commit 746181a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cc110922da7e902b62d18641a370fec01a9fa794
refs/heads/master: d8343f125710fb596f7a88cd756679f14f4e77b9
4 changes: 4 additions & 0 deletions trunk/net/bluetooth/hci_conn.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
#include <net/bluetooth/a2mp.h>
#include <net/bluetooth/smp.h>

static void hci_le_connect(struct hci_conn *conn)
{
Expand Down Expand Up @@ -619,6 +620,9 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
{
BT_DBG("hcon %p", conn);

if (conn->type == LE_LINK)
return smp_conn_security(conn, sec_level);

/* For sdp we don't need the link key. */
if (sec_level == BT_SECURITY_SDP)
return 1;
Expand Down

0 comments on commit 746181a

Please sign in to comment.