Move source tree closer to the 2.6.32.17 mainline
/net/bluetooth/hci_core.c
blob:84a9d75b0c61ede0e98150490abecee369f3fb0f -> blob:e1da8f68759c3a989fc8cd8ddde64949c204f5a1
--- net/bluetooth/hci_core.c
+++ net/bluetooth/hci_core.c
@@ -1239,7 +1239,7 @@ int hci_send_acl(struct hci_conn *conn,
skb->dev = (void *) hdev;
bt_cb(skb)->pkt_type = HCI_ACLDATA_PKT;
- hci_add_acl_hdr(skb, conn->handle, flags);
+ hci_add_acl_hdr(skb, conn->handle, flags | ACL_START);
if (!(list = skb_shinfo(skb)->frag_list)) {
/* Non fragmented */
@@ -1256,14 +1256,12 @@ int hci_send_acl(struct hci_conn *conn,
spin_lock_bh(&conn->data_q.lock);
__skb_queue_tail(&conn->data_q, skb);
- flags &= ~ACL_PB_MASK;
- flags |= ACL_CONT;
do {
skb = list; list = list->next;
skb->dev = (void *) hdev;
bt_cb(skb)->pkt_type = HCI_ACLDATA_PKT;
- hci_add_acl_hdr(skb, conn->handle, flags);
+ hci_add_acl_hdr(skb, conn->handle, flags | ACL_CONT);
BT_DBG("%s frag %p len %d", hdev->name, skb, skb->len);