2012-05-25 21:57:05

by Gustavo Padovan

Subject: [PATCH] Bluetooth: Get a more accurate PDU len

From: Gustavo Padovan <[email protected]>

Both FCS and Extended header might be or might not be present in a ERTM
channel.

Signed-off-by: Gustavo Padovan <[email protected]>
---
net/bluetooth/l2cap_core.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index c07c134..c614532 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -2143,7 +2143,13 @@ static int l2cap_segment_sdu(struct l2cap_chan *chan,
pdu_len = min_t(size_t, pdu_len, L2CAP_BREDR_MAX_PAYLOAD);

/* Adjust for largest possible L2CAP overhead. */
- pdu_len -= L2CAP_EXT_HDR_SIZE + L2CAP_FCS_SIZE;
+ if (chan->fcs)
+ pdu_len -= L2CAP_FCS_SIZE;
+
+ if (test_bit(FLAG_EXT_CTRL, &chan->flags))
+ pdu_len -= L2CAP_EXT_HDR_SIZE;
+ else
+ pdu_len -= L2CAP_ENH_HDR_SIZE;

/* Remote device may have requested smaller PDUs */
pdu_len = min_t(size_t, pdu_len, chan->remote_mps);
--
1.7.10.1

2012-05-26 03:15:44

by Marcel Holtmann

Subject: Re: [PATCH] Bluetooth: Get a more accurate PDU len

Hi Gustavo,

> > From: Gustavo Padovan <[email protected]>
> >
> > Both FCS and Extended header might be or might not be present in a ERTM
> > channel.
> >
> > Signed-off-by: Gustavo Padovan <[email protected]>
> > ---
> > net/bluetooth/l2cap_core.c | 8 +++++++-
> > 1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> > index c07c134..c614532 100644
> > --- a/net/bluetooth/l2cap_core.c
> > +++ b/net/bluetooth/l2cap_core.c
> > @@ -2143,7 +2143,13 @@ static int l2cap_segment_sdu(struct l2cap_chan *chan,
> > pdu_len = min_t(size_t, pdu_len, L2CAP_BREDR_MAX_PAYLOAD);
> >
> > /* Adjust for largest possible L2CAP overhead. */
> > - pdu_len -= L2CAP_EXT_HDR_SIZE + L2CAP_FCS_SIZE;
> > + if (chan->fcs)
> > + pdu_len -= L2CAP_FCS_SIZE;
> > +
> > + if (test_bit(FLAG_EXT_CTRL, &chan->flags))
> > + pdu_len -= L2CAP_EXT_HDR_SIZE;
> > + else
> > + pdu_len -= L2CAP_ENH_HDR_SIZE;
> >
> > /* Remote device may have requested smaller PDUs */
> > pdu_len = min_t(size_t, pdu_len, chan->remote_mps);
> > --
> > 1.7.10.1
>
> Looks good to me.
>
> Reviewed-by: Mat Martineau <[email protected]>

patch has been applied to bluetooth-next tree.

Regards

Marcel

2012-05-25 23:15:45

by Mat Martineau

Subject: Re: [PATCH] Bluetooth: Get a more accurate PDU len

On Fri, 25 May 2012, Gustavo Padovan wrote:

> From: Gustavo Padovan <[email protected]>
>
> Both FCS and Extended header might be or might not be present in a ERTM
> channel.
>
> Signed-off-by: Gustavo Padovan <[email protected]>
> ---
> net/bluetooth/l2cap_core.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index c07c134..c614532 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -2143,7 +2143,13 @@ static int l2cap_segment_sdu(struct l2cap_chan *chan,
> pdu_len = min_t(size_t, pdu_len, L2CAP_BREDR_MAX_PAYLOAD);
>
> /* Adjust for largest possible L2CAP overhead. */
> - pdu_len -= L2CAP_EXT_HDR_SIZE + L2CAP_FCS_SIZE;
> + if (chan->fcs)
> + pdu_len -= L2CAP_FCS_SIZE;
> +
> + if (test_bit(FLAG_EXT_CTRL, &chan->flags))
> + pdu_len -= L2CAP_EXT_HDR_SIZE;
> + else
> + pdu_len -= L2CAP_ENH_HDR_SIZE;
>
> /* Remote device may have requested smaller PDUs */
> pdu_len = min_t(size_t, pdu_len, chan->remote_mps);
> --
> 1.7.10.1

Looks good to me.

Reviewed-by: Mat Martineau <[email protected]>

--
Mat Martineau
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum

2012-05-25 21:22:11

by Mat Martineau

Subject: Re: [PATCH] Bluetooth: Get a more accurate PDU len

On Fri, 25 May 2012, Gustavo Padovan wrote:

> From: Gustavo Padovan <[email protected]>
>
> Both FCS and Extended header might be or might not be present in a ERTM
> channel.
>
> Signed-off-by: Gustavo Padovan <[email protected]>
> ---
> net/bluetooth/l2cap_core.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index c07c134..40d1d6f 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -2143,6 +2143,14 @@ static int l2cap_segment_sdu(struct l2cap_chan *chan,
> pdu_len = min_t(size_t, pdu_len, L2CAP_BREDR_MAX_PAYLOAD);
>
> /* Adjust for largest possible L2CAP overhead. */
> + if (chan->fcs)
> + pdu_len -= L2CAP_FCS_SIZE;
> +
> + if (test_bit(FLAG_EXT_CTRL, &chan->flags))
> + pdu_len -= L2CAP_EXT_HDR_SIZE;
> + else
> + pdu_len -= L2CAP_ENH_HDR_SIZE;
> +
> pdu_len -= L2CAP_EXT_HDR_SIZE + L2CAP_FCS_SIZE;

Don't you want to remove this last line?

>
> /* Remote device may have requested smaller PDUs */
> --
> 1.7.10.1

--
Mat Martineau
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum