summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/mgmt.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-07-07 15:02:27 +0300
committerMarcel Holtmann <marcel@holtmann.org>2014-07-07 15:18:07 +0200
commitd93375a82da10cb023afc945fa18471bf3c41704 (patch)
tree48e919e58d10a86052905d2ccf67535ddc181b4e /net/bluetooth/mgmt.c
parent2b7be33e60c631b3080099baf14c43505fa8017d (diff)
downloadlinux-stable-d93375a82da10cb023afc945fa18471bf3c41704.tar.gz
linux-stable-d93375a82da10cb023afc945fa18471bf3c41704.tar.bz2
linux-stable-d93375a82da10cb023afc945fa18471bf3c41704.zip
Bluetooth: Remove auth_type parameter from hci_connect_le()
The auth_type value which gets assigned to hci_conn->auth_type is something that's only used for BR/EDR connections and is of no value for LE connections. It makes therefore little sense to pass it to the hci_connect_le() function. This patch removes the parameter from the function. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r--net/bluetooth/mgmt.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index ef675acbcfce..e7047de1ba11 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -3118,8 +3118,7 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
hci_conn_params_add(hdev, &cp->addr.bdaddr, addr_type);
conn = hci_connect_le(hdev, &cp->addr.bdaddr, addr_type,
- sec_level, auth_type,
- HCI_LE_CONN_TIMEOUT);
+ sec_level, HCI_LE_CONN_TIMEOUT);
}
if (IS_ERR(conn)) {