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 /include | |
| parent | c6b6eedc29dec8f779fd3420e8c62fd18e7b7c97 (diff) | |
| parent | d8343f125710fb596f7a88cd756679f14f4e77b9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/smp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/smp.h b/include/net/bluetooth/smp.h index ca356a734920..8b27927b2a55 100644 --- a/include/net/bluetooth/smp.h +++ b/include/net/bluetooth/smp.h @@ -136,7 +136,7 @@ struct smp_chan { }; /* SMP Commands */ -int smp_conn_security(struct l2cap_conn *conn, __u8 sec_level); +int smp_conn_security(struct hci_conn *hcon, __u8 sec_level); int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb); int smp_distribute_keys(struct l2cap_conn *conn, __u8 force); int smp_user_confirm_reply(struct hci_conn *conn, u16 mgmt_op, __le32 passkey); |