diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2013-03-15 17:07:03 -0500 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-03-18 14:02:05 -0300 |
| commit | b3f2ca9446f63acf5ab8552a37c4cc90af64b816 (patch) | |
| tree | 910dde2879a2dfb743075faa89552e1fc0d1c694 /net | |
| parent | 3f985050fa5e2f6715b215452198f005df2d5746 (diff) | |
| download | blackbird-obmc-linux-b3f2ca9446f63acf5ab8552a37c4cc90af64b816.tar.gz blackbird-obmc-linux-b3f2ca9446f63acf5ab8552a37c4cc90af64b816.zip | |
Bluetooth: Fix setting local name to the existing value
If user space attempts to set the local name to the same value that's
already set we should simply return a direct command complete for this
mgmt command.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/mgmt.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 28e5975246c7..15305fa55067 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -2408,6 +2408,17 @@ static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data, hci_dev_lock(hdev); + /* If the old values are the same as the new ones just return a + * direct command complete event. + */ + if (!memcmp(hdev->dev_name, cp->name, sizeof(hdev->dev_name)) && + !memcmp(hdev->short_name, cp->short_name, + sizeof(hdev->short_name))) { + err = cmd_complete(sk, hdev->id, MGMT_OP_SET_LOCAL_NAME, 0, + data, len); + goto failed; + } + memcpy(hdev->short_name, cp->short_name, sizeof(hdev->short_name)); if (!hdev_is_powered(hdev)) { |
