From f3f710bb8a87f8fae845c0c42622dc15899dc860 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Tue, 21 Feb 2012 00:52:42 +0200
Subject: [PATCH] --- yaml --- r: 290998 b: refs/heads/master c:
 cacaf52f51697f832a26e8fdaa7b8e85785085da h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/net/bluetooth/mgmt.c | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e6c04a3029c0..23d89dad62cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e16357480fdeaeff7c5572f1afba7835473fcb6
+refs/heads/master: cacaf52f51697f832a26e8fdaa7b8e85785085da
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index aa0d64040fac..a5a2a6844aea 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -3250,6 +3250,18 @@ int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status)
 	return err;
 }
 
+static int clear_eir(struct hci_dev *hdev)
+{
+	struct hci_cp_write_eir cp;
+
+	if (!(hdev->features[6] & LMP_EXT_INQ))
+		return 0;
+
+	memset(&cp, 0, sizeof(cp));
+
+	return hci_send_cmd(hdev, HCI_OP_WRITE_EIR, sizeof(cp), &cp);
+}
+
 int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 status)
 {
 	struct cmd_lookup match = { NULL, hdev };
@@ -3268,9 +3280,15 @@ int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 status)
 	ev = cpu_to_le32(get_current_settings(hdev));
 	err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev), match.sk);
 
-	if (match.sk)
+	if (match.sk) {
 		sock_put(match.sk);
 
+		if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags))
+			update_eir(hdev);
+		else
+			clear_eir(hdev);
+	}
+
 	return err;
 }