diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-09-05 14:46:30 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-09-05 14:46:30 -0400 |
| commit | 518eefe1b6fe53b347ffdfbb15a9367efbfd1955 (patch) | |
| tree | cb31331ad28a5f8854749794a1ad0a550dc5a6bd /net/bluetooth/l2cap_sock.c | |
| parent | c6b6eedc29dec8f779fd3420e8c62fd18e7b7c97 (diff) | |
| parent | d8343f125710fb596f7a88cd756679f14f4e77b9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index b94abd30e6f9..45cb0b0dd2c7 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -615,7 +615,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch break; } - if (smp_conn_security(conn, sec.level)) + if (smp_conn_security(conn->hcon, sec.level)) break; sk->sk_state = BT_CONFIG; chan->state = BT_CONFIG; |