From: Jaikumar Ganesh <jaikumar@google.com>
Date: Tue, 22 Mar 2011 19:27:11 +0000 (-0700)
Subject: Use BT POWER force_active parameter for rx data.
X-Git-Tag: firefly_0821_release~9834^2~34
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8f76fc3515e40d24163f5bc31ee07fa48c1c375a;p=firefly-linux-kernel-4.4.55.git

Use BT POWER force_active parameter for rx data.

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: Ia43682c12795cf2cbd97df2a97e6b3e6cc6dfb34
Signed-off-by: Jaikumar Ganesh <jaikumar@google.com>
---

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index de9127d6b9d3..c2045b77bab9 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -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) {