summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2011-03-22 12:27:11 -0700
committerJaikumar Ganesh <jaikumar@google.com>2011-03-22 13:20:30 -0700
commitdd71a2478264c5b8297f94ed21c79efdcbd57228 (patch)
tree86f54dece6ac77edb91df1d533cad875e3d02973 /net
parented6cbef145af255cefd0ee96842a5531dc56a585 (diff)
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: I0dc5ccae131e8a2245328eba5cc35159e7656e8a Signed-off-by: Jaikumar Ganesh <jaikumar@google.com>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_core.c2
1 files changed, 1 insertions, 1 deletions
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) {