Hi Mat, * Mat Martineau <[email protected]> [2010-08-10 12:14:59 -0700]:
> > Signed-off-by: Mat Martineau <[email protected]> > --- > net/bluetooth/l2cap.c | 23 +++++++++++++---------- > 1 files changed, 13 insertions(+), 10 deletions(-) > > diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c > index 5e78c18..aa69c84 100644 > --- a/net/bluetooth/l2cap.c > +++ b/net/bluetooth/l2cap.c > @@ -1753,33 +1753,36 @@ static struct sk_buff *l2cap_create_iframe_pdu(struct > sock *sk, struct msghdr *m > { > struct l2cap_conn *conn = l2cap_pi(sk)->conn; > struct sk_buff *skb; > - int err, count, hlen = L2CAP_HDR_SIZE + 2; > - struct l2cap_hdr *lh; > + int err, count, hlen = L2CAP_ENHANCED_HDR_SIZE; > + struct l2cap_enhanced_hdr *lh; This patch shouldn't even compile. Since there no definition for struct l2cap_enhanced_hdr. Anyway we should not have that struct, keep the code to handle this as it is. We'll have to change this code again to add the extended control bit field. > > - BT_DBG("sk %p len %d", sk, (int)len); > + BT_DBG("sk %p, msg %p, len %d, control %x, sdulen %d", > + sk, msg, (int)len, control, (int)sdulen); > > if (!conn) > return ERR_PTR(-ENOTCONN); > > if (sdulen) > - hlen += 2; > + hlen += L2CAP_SDULEN_SIZE; Separated patch to add L2CAP_SDULEN_SIZE > > if (l2cap_pi(sk)->fcs == L2CAP_FCS_CRC16) > - hlen += 2; > + hlen += L2CAP_FCS_SIZE; Separated patch to ad L2CAP_FCS_SIZE > > count = min_t(unsigned int, (conn->mtu - hlen), len); > + > skb = bt_skb_send_alloc(sk, count + hlen, > msg->msg_flags & MSG_DONTWAIT, &err); > if (!skb) > - return ERR_PTR(-ENOMEM); > + return ERR_PTR(err); This also should not be in this patch. -- Gustavo F. Padovan http://padovan.org -- 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
