From: Mat Martineau <mathewm@codeaurora.org>
To: linux-bluetooth@vger.kernel.org, gustavo@padovan.org
Cc: sunnyk@codeaurora.org, marcel@holtmann.org
Subject: [PATCHv2 13/19] Bluetooth: Flag ACL frames as complete for AMP controllers
Date: Tue, 16 Oct 2012 16:36:27 -0700 [thread overview]
Message-ID: <1350430593-23565-14-git-send-email-mathewm@codeaurora.org> (raw)
In-Reply-To: <1350430593-23565-1-git-send-email-mathewm@codeaurora.org>
AMP controllers expect to transmit only "complete" ACL frames. These
frames have both the "start" and "cont" bits set. AMP does not allow
fragmented ACLs.
Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
---
net/bluetooth/l2cap_core.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index a6cf657..cb85bdd 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -762,6 +762,15 @@ static void l2cap_do_send(struct l2cap_chan *chan, struct sk_buff *skb)
BT_DBG("chan %p, skb %p len %d priority %u", chan, skb, skb->len,
skb->priority);
+ if (chan->hs_hcon && !__chan_is_moving(chan)) {
+ if (chan->hs_hchan)
+ hci_send_acl(chan->hs_hchan, skb, ACL_COMPLETE);
+ else
+ kfree_skb(skb);
+
+ return;
+ }
+
if (!test_bit(FLAG_FLUSHABLE, &chan->flags) &&
lmp_no_flush_capable(hcon->hdev))
flags = ACL_START_NO_FLUSH;
--
1.7.12.3
--
Mat Martineau
Employee of Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2012-10-16 23:36 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-16 23:36 [PATCHv2 00/19] L2CAP signaling for AMP channel create/move Mat Martineau
2012-10-16 23:36 ` [PATCHv2 01/19] Bluetooth: Add new l2cap_chan struct members for high speed channels Mat Martineau
2012-10-16 23:36 ` [PATCHv2 02/19] Bluetooth: Add L2CAP create channel request handling Mat Martineau
2012-10-16 23:36 ` [PATCHv2 03/19] Bluetooth: Remove unnecessary intermediate function Mat Martineau
2012-10-16 23:36 ` [PATCHv2 04/19] Bluetooth: Lookup channel structure based on DCID Mat Martineau
2012-10-17 17:12 ` Marcel Holtmann
2012-10-18 7:30 ` Andrei Emeltchenko
2012-10-18 15:51 ` Mat Martineau
2012-10-16 23:36 ` [PATCHv2 05/19] Bluetooth: Channel move request handling Mat Martineau
2012-10-18 7:38 ` Andrei Emeltchenko
2012-10-16 23:36 ` [PATCHv2 06/19] Bluetooth: Add new ERTM receive states for channel move Mat Martineau
2012-10-17 17:13 ` Marcel Holtmann
2012-10-16 23:36 ` [PATCHv2 07/19] Bluetooth: Add move channel confirm handling Mat Martineau
2012-10-17 17:16 ` Marcel Holtmann
2012-10-18 7:48 ` Andrei Emeltchenko
2012-10-16 23:36 ` [PATCHv2 08/19] Bluetooth: Add state to hci_chan Mat Martineau
2012-10-16 23:36 ` [PATCHv2 09/19] Bluetooth: Move channel response Mat Martineau
2012-10-17 17:20 ` Marcel Holtmann
2012-10-16 23:36 ` [PATCHv2 10/19] Bluetooth: Add logical link confirm Mat Martineau
2012-10-17 17:22 ` Marcel Holtmann
2012-10-18 8:36 ` Andrei Emeltchenko
2012-10-16 23:36 ` [PATCHv2 11/19] Bluetooth: Add move confirm response handling Mat Martineau
2012-10-16 23:36 ` [PATCHv2 12/19] Bluetooth: Handle physical link completion Mat Martineau
2012-10-16 23:36 ` Mat Martineau [this message]
2012-10-16 23:36 ` [PATCHv2 14/19] Bluetooth: Do not send data during channel move Mat Martineau
2012-10-16 23:36 ` [PATCHv2 15/19] Bluetooth: Configure appropriate timeouts for AMP controllers Mat Martineau
2012-10-16 23:36 ` [PATCHv2 16/19] Bluetooth: Ignore BR/EDR packet size constraints when fragmenting for AMP Mat Martineau
2012-10-16 23:36 ` [PATCHv2 17/19] Bluetooth: Send create channel request instead of connect " Mat Martineau
2012-10-17 17:24 ` Marcel Holtmann
2012-10-18 9:40 ` Andrei Emeltchenko
2012-10-18 16:04 ` Mat Martineau
2012-10-16 23:36 ` [PATCHv2 18/19] Bluetooth: Do not retransmit data during a channel move Mat Martineau
2012-10-16 23:36 ` [PATCHv2 19/19] Bluetooth: Start channel move when socket option is changed Mat Martineau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350430593-23565-14-git-send-email-mathewm@codeaurora.org \
--to=mathewm@codeaurora.org \
--cc=gustavo@padovan.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=sunnyk@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).