aboutsummaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorRam Malovany <ramm@ti.com>2012-07-19 10:26:11 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-14 10:00:18 -0700
commit4a20bce04ec14c74f5b77c73d7d8d476ace74cea (patch)
tree398e58b2c115a384a0d3836f6bd6338c2c642777 /net/bluetooth
parenta8b8ad6dcf49c84c7a8633082191c6fd7539c355 (diff)
Bluetooth: Set name_state to unknown when entry name is empty
commit c3e7c0d90b14a3e7ac091d24cef09efb516d587b upstream. When the name of the given entry is empty , the state needs to be updated accordingly. Signed-off-by: Ram Malovany <ramm@ti.com> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/bluetooth')
-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 df2615d59eb..9cdcfd9f907 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1400,6 +1400,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))