From ca031b0d9df40326087c47a5cb451b0e4ba8948d Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Wed, 22 Feb 2012 18:17:32 +0200
Subject: [PATCH] --- yaml --- r: 291032 b: refs/heads/master c:
 f51d5b248981d05269e4f83ab8f8ed7ed494fe33 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 277fb3fbc8fc..402d199670ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e59fda8dc14c173b74b5e9d5c8d72849d2ff6b5f
+refs/heads/master: f51d5b248981d05269e4f83ab8f8ed7ed494fe33
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
index 498b71a0579a..e44e3fd68628 100644
--- a/trunk/net/bluetooth/hci_event.c
+++ b/trunk/net/bluetooth/hci_event.c
@@ -209,12 +209,12 @@ static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)
 
 	hci_dev_lock(hdev);
 
-	if (test_bit(HCI_MGMT, &hdev->dev_flags))
-		mgmt_set_local_name_complete(hdev, sent, status);
-
 	if (status == 0)
 		memcpy(hdev->dev_name, sent, HCI_MAX_NAME_LENGTH);
 
+	if (test_bit(HCI_MGMT, &hdev->dev_flags))
+		mgmt_set_local_name_complete(hdev, sent, status);
+
 	hci_dev_unlock(hdev);
 }
 
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index 8bc6a7a48732..d756644163bc 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -3561,6 +3561,7 @@ int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status)
 send_event:
 	err = mgmt_event(MGMT_EV_LOCAL_NAME_CHANGED, hdev, &ev, sizeof(ev),
 							cmd ? cmd->sk : NULL);
+	update_eir(hdev);
 
 failed:
 	if (cmd)