diff options
| author |   Johan Hedberg <johan.hedberg@intel.com> | 2014-07-17 15:35:38 +0300 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2014-07-17 14:39:39 +0200 |
| commit | e7cafc45258c852c5176cd421615846e79a3d307 (patch) | |
| tree | 8fbc0fa09ea36fc175d57b46a98ae28450628973 /net/bluetooth/hci_conn.c | |
| parent | Bluetooth: Fix resetting remote authentication requirement after pairing (diff) | |
| download | linux-dev-e7cafc45258c852c5176cd421615846e79a3d307.tar.xz linux-dev-e7cafc45258c852c5176cd421615846e79a3d307.zip | |
Bluetooth: Pass initiator/acceptor information to hci_conn_security()
We're interested in whether an authentication request is because of a
remote or local action. So far hci_conn_security() has been used both
for incoming and outgoing actions (e.g. RFCOMM or L2CAP connect
requests) so without some modifications it cannot know which peer is
responsible for requesting authentication.
This patch adds a new "bool initiator" parameter to hci_conn_security()
to indicate which side is responsible for the request and updates the
current users to pass this information correspondingly.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_conn.c')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index ad5f0b819e90..76c5a38e5997 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -973,7 +973,8 @@ static void hci_conn_encrypt(struct hci_conn *conn) } /* Enable security */ -int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) +int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type, + bool initiator) { BT_DBG("hcon %p", conn); |