From 07968f4d685b29b0740687fed0644942aa0d5b84 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Wed, 22 Feb 2012 21:39:58 +0200
Subject: [PATCH] --- yaml --- r: 291039 b: refs/heads/master c:
 7bdaae4a4bc075cf73ab9c3a531b7229caa1f49e h: refs/heads/master i:   291037:
 551613032b4d5a97424d5385e5e08f7b32a755a3   291035:
 aa4823067d5fa856e6b331282d2471ffafbe6221   291031:
 629dbddb361b5f29599553a9cb3c849af50acb2c   291023:
 85177c966ed3b296d5eafb9c922eae03c58a6108   291007:
 b070bd77b985dabb701fd28e19750cb5d196ed93 v: v3

---
 [refs]                     | 2 +-
 trunk/net/bluetooth/mgmt.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a34fe6561268..85d6928cb54a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28cc7bde5978cbc58c9026123fa5f33b62ad66b3
+refs/heads/master: 7bdaae4a4bc075cf73ab9c3a531b7229caa1f49e
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index 9c1f7714794d..ee57edbb13ec 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -3586,6 +3586,10 @@ int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status)
 	if (!cmd)
 		goto send_event;
 
+	/* Always assume that either the short or the complete name has
+	 * changed if there was a pending mgmt command */
+	changed = true;
+
 	if (status) {
 		err = cmd_status(cmd->sk, hdev->id, MGMT_OP_SET_LOCAL_NAME,
 							mgmt_status(status));