summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorRam Malovany <ramm@ti.com>2012-07-19 09:26:11 +0200
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-08-06 20:19:36 +0200
commitc3e7c0d90b14a3e7ac091d24cef09efb516d587b (patch)
tree35c72e15cdcf2c88a8dc72b6efc96d36e48c11ac /net
parentBluetooth: Fix using a NULL inquiry cache entry (diff)
downloadlinux-c3e7c0d90b14a3e7ac091d24cef09efb516d587b.tar.xz
linux-c3e7c0d90b14a3e7ac091d24cef09efb516d587b.zip
Bluetooth: Set name_state to unknown when entry name is empty
When the name of the given entry is empty , the state needs to be updated accordingly. Cc: stable@vger.kernel.org Signed-off-by: Ram Malovany <ramm@ti.com> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_event.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index fe9a3d6d30b0..715d7e33fba0 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1408,6 +1408,8 @@ static void hci_check_pending_name(struct hci_dev *hdev, struct hci_conn *conn,
e->name_state = NAME_KNOWN;
mgmt_remote_name(hdev, bdaddr, ACL_LINK, 0x00,
e->data.rssi, name, name_len);
+ } else {
+ e->name_state = NAME_NOT_KNOWN;
}
if (hci_resolve_next_name(hdev))