---

yaml --- r: 279290 b: refs/heads/master c: 65983fc h: refs/heads/master v: v3
git-mirror · Dec 18, 2011 · 3c8ca8e · 3c8ca8e
1 parent c3e8452
commit 3c8ca8e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f42809185896296d5662778e4ec63e084cfa5f2b
+refs/heads/master: 65983fc7bb8df655706cb6e8353b6561b633ee4d
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
@@ -2455,7 +2455,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, bt_cb(skb)->force_active);
+		hci_conn_enter_active_mode(conn, BT_POWER_FORCE_ACTIVE_OFF);
 
 		/* Send to upper protocol */
 		hp = hci_proto[HCI_PROTO_L2CAP];