summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/smp.c
diff options
context:
space:
mode:
authorVinicius Costa Gomes <vinicius.gomes@openbossa.org>2012-08-23 21:32:43 -0300
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-08-27 08:07:18 -0700
commitcc110922da7e902b62d18641a370fec01a9fa794 (patch)
tree3629d8b4b5197d50604ff0177eb77de96f0a9f99 /net/bluetooth/smp.c
parent1fa6535faf055cd71311ab887e94fc234f04ee18 (diff)
downloadblackbird-op-linux-cc110922da7e902b62d18641a370fec01a9fa794.tar.gz
blackbird-op-linux-cc110922da7e902b62d18641a370fec01a9fa794.zip
Bluetooth: Change signature of smp_conn_security()
To make it clear that it may be called from contexts that may not have any knowledge of L2CAP, we change the connection parameter, to receive a hci_conn. This also makes it clear that it is checking the security of the link. Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/smp.c')
-rw-r--r--net/bluetooth/smp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 98ffc1b6a6fa..8c225ef349cd 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -760,9 +760,9 @@ static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb)
return 0;
}
-int smp_conn_security(struct l2cap_conn *conn, __u8 sec_level)
+int smp_conn_security(struct hci_conn *hcon, __u8 sec_level)
{
- struct hci_conn *hcon = conn->hcon;
+ struct l2cap_conn *conn = hcon->l2cap_data;
struct smp_chan *smp = conn->smp_chan;
__u8 authreq;
OpenPOWER on IntegriCloud