Hi Gustavo,
On Wed, Aug 24, 2011 at 05:43:04PM -0300, Gustavo Padovan wrote:
> Hi Andrei,
>
> * Emeltchenko Andrei <Andrei.Emeltchenko.news@xxxxxxxxx> [2011-08-18 10:44:57 +0300]:
>
> > From: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
> >
> > Based upon haijun.liu <haijun.liu@xxxxxxxxxxx> series of patches
> > (sent Sun, 22 Aug 2010)
> > ---
> > include/net/bluetooth/l2cap.h | 37 +++++++++++++++++++++++++++++++++++++
> > 1 files changed, 37 insertions(+), 0 deletions(-)
> >
> > diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
> > index 9850cb5..d2154e0 100644
> > --- a/include/net/bluetooth/l2cap.h
> > +++ b/include/net/bluetooth/l2cap.h
> > @@ -38,6 +38,9 @@
> > #define L2CAP_DEFAULT_MAX_PDU_SIZE 1009 /* Sized for 3-DH5 packet */
> > #define L2CAP_DEFAULT_ACK_TO 200
> > #define L2CAP_LE_DEFAULT_MTU 23
> > +#define L2CAP_DEFAULT_MAX_SDU_SIZE 0xFFFF
> > +#define L2CAP_DEFAULT_SDU_ARRIVAL_TIME 0xFFFFFFFF
> > +#define L2CAP_DEFAULT_ACCESS_LATENCY 0xFFFFFFFF
> >
> > #define L2CAP_CONN_TIMEOUT (40000) /* 40 seconds */
> > #define L2CAP_INFO_TIMEOUT (4000) /* 4 seconds */
> > @@ -218,6 +221,8 @@ struct l2cap_conf_rsp {
> > #define L2CAP_CONF_UNACCEPT 0x0001
> > #define L2CAP_CONF_REJECT 0x0002
> > #define L2CAP_CONF_UNKNOWN 0x0003
> > +#define L2CAP_CONF_PENDING 0x0004
> > +#define L2CAP_CONF_EFS_REJECT 0x0005
> >
> > struct l2cap_conf_opt {
> > __u8 type;
> > @@ -234,6 +239,7 @@ struct l2cap_conf_opt {
> > #define L2CAP_CONF_QOS 0x03
> > #define L2CAP_CONF_RFC 0x04
> > #define L2CAP_CONF_FCS 0x05
> > +#define L2CAP_CONF_EFS 0x06
> >
> > #define L2CAP_CONF_MAX_SIZE 22
> >
> > @@ -252,6 +258,19 @@ struct l2cap_conf_rfc {
> > #define L2CAP_MODE_ERTM 0x03
> > #define L2CAP_MODE_STREAMING 0x04
> >
> > +struct l2cap_conf_efs {
> > + __u8 id;
> > + __u8 service_type;
> > + __le16 max_sdu_size;
> > + __le32 sdu_inter_time;
> > + __le32 access_latency;
> > + __le32 flush_timeout;
> > +} __packed;
> > +
> > +#define L2CAP_SERVTYPE_NOTRAFIC 0x00
> > +#define L2CAP_SERVTYPE_BESTEFFORT 0x01
> > +#define L2CAP_SERVTYPE_GUARANTEED 0x02
> > +
> > struct l2cap_disconn_req {
> > __le16 dcid;
> > __le16 scid;
> > @@ -365,6 +384,22 @@ struct l2cap_chan {
> > __u8 remote_max_tx;
> > __u16 remote_mps;
> >
> > + __u8 local_id;
> > + __u8 local_stype;
> > + __u16 local_msdu;
> > + __u32 local_sdu_itime;
> > + __u32 local_acc_lat;
> > + __u32 local_flush_to;
> > +
> > + __u8 remote_id;
> > + __u8 remote_stype;
> > + __u16 remote_msdu;
> > + __u32 remote_sdu_itime;
> > + __u32 remote_acc_lat;
> > + __u32 remote_flush_to;
> > +
> > + __u8 ext_flowspec_enable;
>
> this one could be a flag into conf_state or conn_state.
Maybe more logical would be to create flags otherwise it gets mixed
with configuration state flags or connection state flags. Like:
unsigned long flags;
and move other flags here (like flushable)
> > +
> > struct timer_list chan_timer;
> > struct timer_list retrans_timer;
> > struct timer_list monitor_timer;
> > @@ -452,6 +487,8 @@ enum {
> > CONF_CONNECT_PEND,
> > CONF_NO_FCS_RECV,
> > CONF_STATE2_DEVICE,
> > + CONF_LOCAL_PEND,
> > + CONF_REMOTE_PEND,
>
> What do CONF_LOCAL_PEND and CONF_REMOTE_PEND mean?
those pending states mean that configuration request sent with
L2CAP_CONF_PENDING and cleared after receiving L2CAP_CONF_SUCCESS.
Best regards
Andrei Emeltchenko
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
