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/rfcomm | |
| parent | c1d4fa7aa86e9194724dfff9cb9359edb98d75ac (diff) | |
| download | linux-e7cafc45258c852c5176cd421615846e79a3d307.tar.bz2 | |
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/rfcomm')
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 754b6fe4f742..a0690a84f3e9 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -227,7 +227,8 @@ static int rfcomm_check_security(struct rfcomm_dlc *d) break; } - return hci_conn_security(conn->hcon, d->sec_level, auth_type); + return hci_conn_security(conn->hcon, d->sec_level, auth_type, + d->out); } static void rfcomm_session_timeout(unsigned long arg) |