summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-02-23 15:57:46 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-23 17:01:49 +0200
commit9997a5332320dbaaee64b5c0581ccaa6589a15c9 (patch)
tree8904f6e74837b2d217f96dee62ec7e88b3914d33 /net/bluetooth
parent504c8dcd6b0ec3cd36ab221695c5516e88cf3d79 (diff)
downloadlinux-stable-9997a5332320dbaaee64b5c0581ccaa6589a15c9.tar.gz
linux-stable-9997a5332320dbaaee64b5c0581ccaa6589a15c9.tar.bz2
linux-stable-9997a5332320dbaaee64b5c0581ccaa6589a15c9.zip
Bluetooth: mgmt: Fix return value of add/remove_uuid
The Add/Remove UUID commands should return the device class instead of an empty parameter list. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Gustavo F. Padovan <padovan@profusion.mobi> Acked-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/mgmt.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 4e4889490635..000abc07bc1e 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1367,7 +1367,7 @@ static int add_uuid(struct sock *sk, u16 index, void *data, u16 len)
if (err < 0)
goto failed;
- err = cmd_complete(sk, index, MGMT_OP_ADD_UUID, 0, NULL, 0);
+ err = cmd_complete(sk, index, MGMT_OP_ADD_UUID, 0, hdev->dev_class, 3);
failed:
hci_dev_unlock(hdev);
@@ -1428,7 +1428,8 @@ static int remove_uuid(struct sock *sk, u16 index, void *data, u16 len)
if (err < 0)
goto unlock;
- err = cmd_complete(sk, index, MGMT_OP_REMOVE_UUID, 0, NULL, 0);
+ err = cmd_complete(sk, index, MGMT_OP_REMOVE_UUID, 0,
+ hdev->dev_class, 3);
unlock:
hci_dev_unlock(hdev);