summaryrefslogtreecommitdiff
path: root/net/bluetooth/mgmt.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-02-22 21:46:22 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-23 13:07:00 +0200
commit27fcc362297b8e838a929c947b82eabb3f4b7591 (patch)
tree311d390359aebb26f446f304deebaaa0b1e65536 /net/bluetooth/mgmt.c
parent7bdaae4a4bc075cf73ab9c3a531b7229caa1f49e (diff)
downloadkernel-common-27fcc362297b8e838a929c947b82eabb3f4b7591.tar.gz
kernel-common-27fcc362297b8e838a929c947b82eabb3f4b7591.tar.bz2
kernel-common-27fcc362297b8e838a929c947b82eabb3f4b7591.zip
Bluetooth: mgmt: Fix missing short_name in read_info
The short name is part of the Read Controller Info response and should be appropriately filled in based on the value of hdev->short_name. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r--net/bluetooth/mgmt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index ee57edbb13ec..6850a8b46c62 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -648,6 +648,7 @@ static int read_controller_info(struct sock *sk, u16 index)
memcpy(rp.dev_class, hdev->dev_class, 3);
memcpy(rp.name, hdev->dev_name, sizeof(hdev->dev_name));
+ memcpy(rp.short_name, hdev->short_name, sizeof(hdev->short_name));
hci_dev_unlock(hdev);
hci_dev_put(hdev);