Use BT POWER force_active parameter for rx data.
authorJaikumar Ganesh <jaikumar@google.com>
Tue, 22 Mar 2011 19:27:11 +0000 (12:27 -0700)
committerJaikumar Ganesh <jaikumar@google.com>
Tue, 22 Mar 2011 20:20:30 +0000 (13:20 -0700)
We were going to active mode during rx processing which
defeats the purpose of force_active parameter for HID devices.

Based on a report and discussion with Leijun Tao <L.J.Tao@motorola.com>

Change-Id: I0dc5ccae131e8a2245328eba5cc35159e7656e8a
Signed-off-by: Jaikumar Ganesh <jaikumar@google.com>
net/bluetooth/hci_core.c

index de9127d6b9d3b99c28f490dcb05c1510eb18eabd..c2045b77bab909cc39e4311c7a0a7cd392cbf689 100644 (file)
@@ -1609,7 +1609,7 @@ static inline void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
        if (conn) {
                register struct hci_proto *hp;
 
-               hci_conn_enter_active_mode(conn, 1);
+               hci_conn_enter_active_mode(conn, bt_cb(skb)->force_active);
 
                /* Send to upper protocol */
                if ((hp = hci_proto[HCI_PROTO_L2CAP]) && hp->recv_acldata) {