summaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-02-09 19:19:27 +0400
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-13 19:01:37 +0400
commit82eb703efc2ad2ac52cada85a5119bb9dfcea942 (patch)
treea3c772d239cb6705f116f74de687b5aca24849c4 /net/bluetooth
parentbab73cb68435232ba78a4bd1ac1a85862e3be0bb (diff)
downloadlinux-82eb703efc2ad2ac52cada85a5119bb9dfcea942.tar.xz
Bluetooth: Fix mgmt_unpair_device command status
The default response status to unpair_device should be set as 0 instead of a generic failure value. When disconnection is not needed (i.e. we can reply imediately) we should return success and not failure. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/mgmt.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 545919828562..0cf0f4dc8213 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1097,7 +1097,6 @@ static int unpair_device(struct sock *sk, u16 index, void *data, u16 len)
memset(&rp, 0, sizeof(rp));
bacpy(&rp.addr.bdaddr, &cp->addr.bdaddr);
rp.addr.type = cp->addr.type;
- rp.status = MGMT_STATUS_FAILED;
if (cp->addr.type == MGMT_ADDR_BREDR)
err = hci_remove_link_key(hdev, &cp->addr.bdaddr);