summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-02-27 23:57:24 +0100
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-28 00:52:34 +0100
commit0b60eba1b29740a606e6b7694d2dc98b6085a1bf (patch)
treeb8e0a808062b3d8bdee50f48bcc39574a4fba3e2
parentBluetooth: Use kernel int types instead of ones from stdint.h (diff)
downloadlinux-0b60eba1b29740a606e6b7694d2dc98b6085a1bf.tar.xz
linux-0b60eba1b29740a606e6b7694d2dc98b6085a1bf.zip
Bluetooth: Don't send unnecessary write_le_enable command
If the local host features indicate that LE is already in the state that is desired there's no point in sending the HCI command to try to change the setting. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--net/bluetooth/mgmt.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 27830f401698..c4d3bc9c86b5 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1260,7 +1260,7 @@ static int set_le(struct sock *sk, u16 index, void *data, u16 len)
struct pending_cmd *cmd;
struct hci_dev *hdev;
int err;
- u8 val;
+ u8 val, enabled;
BT_DBG("request for hci%u", index);
@@ -1280,8 +1280,9 @@ static int set_le(struct sock *sk, u16 index, void *data, u16 len)
}
val = !!cp->val;
+ enabled = !!(hdev->host_features[0] & LMP_HOST_LE);
- if (!hdev_is_powered(hdev)) {
+ if (!hdev_is_powered(hdev) || val == enabled) {
bool changed = false;
if (val != test_bit(HCI_LE_ENABLED, &hdev->dev_flags)) {