Re: [RFC 1/2] Bluetooth: Header changes for ERTM state machine replacement

Ulisses -

On 2/24/2012 9:39 AM, Ulisses Furquim wrote:

Hi Mat,

On Thu, Feb 23, 2012 at 6:37 PM, Mat Martineau[off-list ref]  wrote:

quoted

This change affects data structures storing ERTM state and control
fields, and adds new definitions for states and events.  An
l2cap_seq_list structure is added for tracking ERTM sequence numbers
without repeated memory allocations.  Control fields are carried in
the bt_skb_cb struct rather than constantly doing shift and mask
operations.

Signed-off-by: Mat Martineau<redacted>
---
  include/net/bluetooth/bluetooth.h |   14 ++-
  include/net/bluetooth/l2cap.h     |  260 +++++++++----------------------------
  2 files changed, 73 insertions(+), 201 deletions(-)

<snip>

quoted

diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index d6d8ec8..a499b60 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h

<snip>

quoted

@@ -645,200 +664,43 @@ static inline bool l2cap_clear_timer(struct l2cap_chan *chan,

  #define __set_chan_timer(c, t) l2cap_set_timer(c,&c->chan_timer, (t))
  #define __clear_chan_timer(c) l2cap_clear_timer(c,&c->chan_timer)

Are these two still needed? I saw you moved others to l2cap_core.c
which is fine but what about these?

Since these macros are unrelated to ERTM, that would be a separate patch.

I think all the macros traditionally land in the header files because there are no #defines in the l2cap*.c files.  However, I see that many other .c files in net/bluetooth do have #defines.

It's not that I "moved" the other macros, as much as my ported code had static functions instead.  I tried to minimize changes to the ported code rather than minimize changes to the upstream code.

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