Revert "Bluetooth: Hack: Do not use power_save feature."
authorJaikumar Ganesh <jaikumar@google.com>
Wed, 10 Nov 2010 23:45:07 +0000 (15:45 -0800)
committerJaikumar Ganesh <jaikumar@google.com>
Wed, 10 Nov 2010 23:58:24 +0000 (15:58 -0800)
This reverts commit 3b02c046c3dfef5b5c4fa0c45b69654c107c7403.

Signed-off-by: Jaikumar Ganesh<jaikumar@google.com>
net/bluetooth/hci_conn.c

index 1c8c30d52b537b4a74f17aca8e5ce69b75e79e2e..aabe0c3d48296dad605b48c15664bb8408aa320c 100644 (file)
@@ -540,7 +540,7 @@ void hci_conn_enter_active_mode(struct hci_conn *conn)
        if (test_bit(HCI_RAW, &hdev->flags))
                return;
 
-       if (conn->mode != HCI_CM_SNIFF /* || !conn->power_save */)
+       if (conn->mode != HCI_CM_SNIFF || !conn->power_save)
                goto timer;
 
        if (!test_and_set_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend)) {