Skip to content

Commit

Permalink
Bluetooth: Remove redundant code from mgmt_block & mgmt_unblock
Browse files Browse the repository at this point in the history
There's no need to deal with mgmt_pending_cmd when blocking and
unblocking devices since these actions are synchronous.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
  • Loading branch information
Johan Hedberg authored and Gustavo F. Padovan committed Nov 8, 2011
1 parent 3243553 commit 889d07e
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions net/bluetooth/mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -1671,7 +1671,6 @@ static int block_device(struct sock *sk, u16 index, unsigned char *data,
u16 len)
{
struct hci_dev *hdev;
struct pending_cmd *cmd;
struct mgmt_cp_block_device *cp = (void *) data;
int err;

Expand All @@ -1688,23 +1687,13 @@ static int block_device(struct sock *sk, u16 index, unsigned char *data,

hci_dev_lock_bh(hdev);

cmd = mgmt_pending_add(sk, MGMT_OP_BLOCK_DEVICE, index, NULL, 0);
if (!cmd) {
err = -ENOMEM;
goto failed;
}

err = hci_blacklist_add(hdev, &cp->bdaddr);

if (err < 0)
err = cmd_status(sk, index, MGMT_OP_BLOCK_DEVICE, -err);
else
err = cmd_complete(sk, index, MGMT_OP_BLOCK_DEVICE,
NULL, 0);

mgmt_pending_remove(cmd);

failed:
hci_dev_unlock_bh(hdev);
hci_dev_put(hdev);

Expand All @@ -1715,7 +1704,6 @@ static int unblock_device(struct sock *sk, u16 index, unsigned char *data,
u16 len)
{
struct hci_dev *hdev;
struct pending_cmd *cmd;
struct mgmt_cp_unblock_device *cp = (void *) data;
int err;

Expand All @@ -1732,12 +1720,6 @@ static int unblock_device(struct sock *sk, u16 index, unsigned char *data,

hci_dev_lock_bh(hdev);

cmd = mgmt_pending_add(sk, MGMT_OP_UNBLOCK_DEVICE, index, NULL, 0);
if (!cmd) {
err = -ENOMEM;
goto failed;
}

err = hci_blacklist_del(hdev, &cp->bdaddr);

if (err < 0)
Expand All @@ -1746,9 +1728,6 @@ static int unblock_device(struct sock *sk, u16 index, unsigned char *data,
err = cmd_complete(sk, index, MGMT_OP_UNBLOCK_DEVICE,
NULL, 0);

mgmt_pending_remove(cmd);

failed:
hci_dev_unlock_bh(hdev);
hci_dev_put(hdev);

Expand Down

0 comments on commit 889d07e

Please sign in to comment.