In order to not limit ERTM and streaming mode PDUs to the HCI MTU size, L2CAP must be able to split PDUs in to multple HCI fragments. This is done by allocating space for the FCS in the last fragment.
Signed-off-by: Mat Martineau <[email protected]> --- net/bluetooth/l2cap.c | 39 ++++++++++++++++++++++++++++++++++----- 1 files changed, 34 insertions(+), 5 deletions(-) diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index aa69c84..b485c4a 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -1664,31 +1664,63 @@ static inline int l2cap_skbuff_fromiovec(struct sock *sk, struct msghdr *msg, in { struct l2cap_conn *conn = l2cap_pi(sk)->conn; struct sk_buff **frag; + struct sk_buff *final; int err, sent = 0; + BT_DBG("sk %p, msg %p, len %d, count %d, skb %p", sk, + msg, (int)len, (int)count, skb); + if (memcpy_fromiovec(skb_put(skb, count), msg->msg_iov, count)) return -EFAULT; sent += count; len -= count; + final = skb; /* Continuation fragments (no L2CAP header) */ frag = &skb_shinfo(skb)->frag_list; while (len) { + int skblen; count = min_t(unsigned int, conn->mtu, len); - *frag = bt_skb_send_alloc(sk, count, msg->msg_flags & MSG_DONTWAIT, &err); + /* Add room for the FCS if it fits */ + if (l2cap_pi(sk)->fcs == L2CAP_FCS_CRC16 && + len + L2CAP_FCS_SIZE <= conn->mtu) + skblen = count + L2CAP_FCS_SIZE; + else + skblen = count; + + *frag = bt_skb_send_alloc(sk, skblen, + msg->msg_flags & MSG_DONTWAIT, &err); if (!*frag) return -EFAULT; - if (memcpy_fromiovec(skb_put(*frag, count), msg->msg_iov, count)) + + if (memcpy_fromiovec(skb_put(*frag, count), + msg->msg_iov, count)) return -EFAULT; sent += count; len -= count; + final = *frag; + frag = &(*frag)->next; } + if (l2cap_pi(sk)->fcs == L2CAP_FCS_CRC16) { + if (skb_tailroom(final) < L2CAP_FCS_SIZE) { + *frag = bt_skb_send_alloc(sk, L2CAP_FCS_SIZE, + msg->msg_flags & MSG_DONTWAIT, + &err); + if (!*frag) + return -EFAULT; + + final = *frag; + } + + skb_put(final, L2CAP_FCS_SIZE); + } + return sent; } @@ -1790,9 +1822,6 @@ static struct sk_buff *l2cap_create_iframe_pdu(struct sock *sk, struct msghdr *m return ERR_PTR(err); } - if (l2cap_pi(sk)->fcs == L2CAP_FCS_CRC16) - put_unaligned_le16(0, skb_put(skb, 2)); - bt_cb(skb)->retries = 0; return skb; } -- 1.7.1 -- Mat Martineau Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
