* [PATCH -v3 1/2] Bluetooth: Create function to return the ERTM header size
@ 2012-05-29 16:29 Gustavo Padovan
2012-05-29 16:29 ` [PATCH -v3 2/2] Bluetooth: Remove unused err var from l2cap_segment_sdu() Gustavo Padovan
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Gustavo Padovan @ 2012-05-29 16:29 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Gustavo Padovan
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Simplify the handling of different ERTM header size. We were the same
check in some places of the code, and more is expected to come, so just
replace them with a function.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
net/bluetooth/l2cap_core.c | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 3daac2c..acd43aa 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -822,17 +822,20 @@ static inline void __pack_control(struct l2cap_chan *chan,
}
}
+static inline unsigned int __ertm_hdr_size(struct l2cap_chan *chan)
+{
+ if (test_bit(FLAG_EXT_CTRL, &chan->flags))
+ return L2CAP_EXT_HDR_SIZE;
+ else
+ return L2CAP_ENH_HDR_SIZE;
+}
+
static struct sk_buff *l2cap_create_sframe_pdu(struct l2cap_chan *chan,
u32 control)
{
struct sk_buff *skb;
struct l2cap_hdr *lh;
- int hlen;
-
- if (test_bit(FLAG_EXT_CTRL, &chan->flags))
- hlen = L2CAP_EXT_HDR_SIZE;
- else
- hlen = L2CAP_ENH_HDR_SIZE;
+ int hlen = __ertm_hdr_size(chan);
if (chan->fcs == L2CAP_FCS_CRC16)
hlen += L2CAP_FCS_SIZE;
@@ -2017,10 +2020,7 @@ static struct sk_buff *l2cap_create_iframe_pdu(struct l2cap_chan *chan,
if (!conn)
return ERR_PTR(-ENOTCONN);
- if (test_bit(FLAG_EXT_CTRL, &chan->flags))
- hlen = L2CAP_EXT_HDR_SIZE;
- else
- hlen = L2CAP_ENH_HDR_SIZE;
+ hlen = __ertm_hdr_size(chan);
if (sdulen)
hlen += L2CAP_SDULEN_SIZE;
@@ -2086,10 +2086,7 @@ static int l2cap_segment_sdu(struct l2cap_chan *chan,
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 -= __ertm_hdr_size(chan);
/* Remote device may have requested smaller PDUs */
pdu_len = min_t(size_t, pdu_len, chan->remote_mps);
--
1.7.10.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH -v3 2/2] Bluetooth: Remove unused err var from l2cap_segment_sdu()
2012-05-29 16:29 [PATCH -v3 1/2] Bluetooth: Create function to return the ERTM header size Gustavo Padovan
@ 2012-05-29 16:29 ` Gustavo Padovan
2012-05-30 21:35 ` Mat Martineau
2012-05-30 21:33 ` [PATCH -v3 1/2] Bluetooth: Create function to return the ERTM header size Mat Martineau
2012-05-31 13:58 ` Johan Hedberg
2 siblings, 1 reply; 6+ messages in thread
From: Gustavo Padovan @ 2012-05-29 16:29 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Gustavo Padovan
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Trivial fix, let the code cleaner.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
net/bluetooth/l2cap_core.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index acd43aa..db54e2d 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -2067,7 +2067,6 @@ static int l2cap_segment_sdu(struct l2cap_chan *chan,
struct sk_buff *skb;
u16 sdu_len;
size_t pdu_len;
- int err = 0;
u8 sar;
BT_DBG("chan %p, msg %p, len %d", chan, msg, (int)len);
@@ -2126,7 +2125,7 @@ static int l2cap_segment_sdu(struct l2cap_chan *chan,
}
}
- return err;
+ return 0;
}
int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
--
1.7.10.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH -v3 2/2] Bluetooth: Remove unused err var from l2cap_segment_sdu()
2012-05-29 16:29 ` [PATCH -v3 2/2] Bluetooth: Remove unused err var from l2cap_segment_sdu() Gustavo Padovan
@ 2012-05-30 21:35 ` Mat Martineau
0 siblings, 0 replies; 6+ messages in thread
From: Mat Martineau @ 2012-05-30 21:35 UTC (permalink / raw)
To: Gustavo Padovan, marcel; +Cc: linux-bluetooth, Gustavo Padovan
Gustavo -
On Tue, 29 May 2012, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
>
> Trivial fix, let the code cleaner.
>
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> ---
> net/bluetooth/l2cap_core.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index acd43aa..db54e2d 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -2067,7 +2067,6 @@ static int l2cap_segment_sdu(struct l2cap_chan *chan,
> struct sk_buff *skb;
> u16 sdu_len;
> size_t pdu_len;
> - int err = 0;
> u8 sar;
>
> BT_DBG("chan %p, msg %p, len %d", chan, msg, (int)len);
> @@ -2126,7 +2125,7 @@ static int l2cap_segment_sdu(struct l2cap_chan *chan,
> }
> }
>
> - return err;
> + return 0;
> }
>
> int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
> --
> 1.7.10.2
This is fine. I have some other changes for l2cap_segment_sdu, but
they don't use the err variable either.
Reviewed-by: Mat Martineau <mathewm@codeaurora.org>
--
Mat Martineau
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH -v3 1/2] Bluetooth: Create function to return the ERTM header size
2012-05-29 16:29 [PATCH -v3 1/2] Bluetooth: Create function to return the ERTM header size Gustavo Padovan
2012-05-29 16:29 ` [PATCH -v3 2/2] Bluetooth: Remove unused err var from l2cap_segment_sdu() Gustavo Padovan
@ 2012-05-30 21:33 ` Mat Martineau
2012-05-31 7:45 ` Andrei Emeltchenko
2012-05-31 13:58 ` Johan Hedberg
2 siblings, 1 reply; 6+ messages in thread
From: Mat Martineau @ 2012-05-30 21:33 UTC (permalink / raw)
To: Gustavo Padovan, marcel; +Cc: linux-bluetooth, Gustavo Padovan
Gustavo -
On Tue, 29 May 2012, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
>
> Simplify the handling of different ERTM header size. We were the same
> check in some places of the code, and more is expected to come, so just
> replace them with a function.
>
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> ---
> net/bluetooth/l2cap_core.c | 25 +++++++++++--------------
> 1 file changed, 11 insertions(+), 14 deletions(-)
>
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index 3daac2c..acd43aa 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -822,17 +822,20 @@ static inline void __pack_control(struct l2cap_chan *chan,
> }
> }
>
> +static inline unsigned int __ertm_hdr_size(struct l2cap_chan *chan)
> +{
> + if (test_bit(FLAG_EXT_CTRL, &chan->flags))
> + return L2CAP_EXT_HDR_SIZE;
> + else
> + return L2CAP_ENH_HDR_SIZE;
> +}
> +
> static struct sk_buff *l2cap_create_sframe_pdu(struct l2cap_chan *chan,
> u32 control)
> {
> struct sk_buff *skb;
> struct l2cap_hdr *lh;
> - int hlen;
> -
> - if (test_bit(FLAG_EXT_CTRL, &chan->flags))
> - hlen = L2CAP_EXT_HDR_SIZE;
> - else
> - hlen = L2CAP_ENH_HDR_SIZE;
> + int hlen = __ertm_hdr_size(chan);
>
> if (chan->fcs == L2CAP_FCS_CRC16)
> hlen += L2CAP_FCS_SIZE;
> @@ -2017,10 +2020,7 @@ static struct sk_buff *l2cap_create_iframe_pdu(struct l2cap_chan *chan,
> if (!conn)
> return ERR_PTR(-ENOTCONN);
>
> - if (test_bit(FLAG_EXT_CTRL, &chan->flags))
> - hlen = L2CAP_EXT_HDR_SIZE;
> - else
> - hlen = L2CAP_ENH_HDR_SIZE;
> + hlen = __ertm_hdr_size(chan);
>
> if (sdulen)
> hlen += L2CAP_SDULEN_SIZE;
> @@ -2086,10 +2086,7 @@ static int l2cap_segment_sdu(struct l2cap_chan *chan,
> 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 -= __ertm_hdr_size(chan);
>
> /* Remote device may have requested smaller PDUs */
> pdu_len = min_t(size_t, pdu_len, chan->remote_mps);
> --
> 1.7.10.2
Looks good to me.
Reviewed-by: Mat Martineau <mathewm@codeaurora.org>
--
Mat Martineau
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH -v3 1/2] Bluetooth: Create function to return the ERTM header size
2012-05-29 16:29 [PATCH -v3 1/2] Bluetooth: Create function to return the ERTM header size Gustavo Padovan
2012-05-29 16:29 ` [PATCH -v3 2/2] Bluetooth: Remove unused err var from l2cap_segment_sdu() Gustavo Padovan
2012-05-30 21:33 ` [PATCH -v3 1/2] Bluetooth: Create function to return the ERTM header size Mat Martineau
@ 2012-05-31 13:58 ` Johan Hedberg
2 siblings, 0 replies; 6+ messages in thread
From: Johan Hedberg @ 2012-05-31 13:58 UTC (permalink / raw)
To: Gustavo Padovan; +Cc: linux-bluetooth, Gustavo Padovan
Hi Gustavo,
On Tue, May 29, 2012, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
>
> Simplify the handling of different ERTM header size. We were the same
> check in some places of the code, and more is expected to come, so just
> replace them with a function.
>
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> ---
> net/bluetooth/l2cap_core.c | 25 +++++++++++--------------
> 1 file changed, 11 insertions(+), 14 deletions(-)
Both patches have been applied to bluetooth-next. Thanks.
Johan
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-05-31 13:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-29 16:29 [PATCH -v3 1/2] Bluetooth: Create function to return the ERTM header size Gustavo Padovan
2012-05-29 16:29 ` [PATCH -v3 2/2] Bluetooth: Remove unused err var from l2cap_segment_sdu() Gustavo Padovan
2012-05-30 21:35 ` Mat Martineau
2012-05-30 21:33 ` [PATCH -v3 1/2] Bluetooth: Create function to return the ERTM header size Mat Martineau
2012-05-31 7:45 ` Andrei Emeltchenko
2012-05-31 13:58 ` Johan Hedberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox