---

yaml --- r: 291040 b: refs/heads/master c: 27fcc36 h: refs/heads/master v: v3
git-mirror · Feb 23, 2012 · dcc1cdf · dcc1cdf
1 parent 07968f4
commit dcc1cdf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bdaae4a4bc075cf73ab9c3a531b7229caa1f49e
+refs/heads/master: 27fcc362297b8e838a929c947b82eabb3f4b7591
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/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);