Hi Andrei,
> diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
> index f141fbe..b6ed4e5 100644
> --- a/include/net/bluetooth/l2cap.h
> +++ b/include/net/bluetooth/l2cap.h
> @@ -51,6 +51,8 @@
> #define L2CAP_CONN_TIMEOUT (40000) /* 40 seconds */
> #define L2CAP_INFO_TIMEOUT (4000) /* 4 seconds */
>
> +#define L2CAP_A2MP_DEFAULT_MTU 670
> +
> /* L2CAP socket address */
> struct sockaddr_l2 {
> sa_family_t l2_family;
> @@ -224,6 +226,7 @@ struct l2cap_conn_rsp {
> /* channel indentifier */
> #define L2CAP_CID_SIGNALING 0x0001
> #define L2CAP_CID_CONN_LESS 0x0002
> +#define L2CAP_CID_A2MP 0x0003
> #define L2CAP_CID_LE_DATA 0x0004
> #define L2CAP_CID_LE_SIGNALING 0x0005
> #define L2CAP_CID_SMP 0x0006
> @@ -827,5 +830,6 @@ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
> u32 priority);
> void l2cap_chan_busy(struct l2cap_chan *chan, int busy);
> int l2cap_chan_check_security(struct l2cap_chan *chan);
> +void l2cap_ertm_init(struct l2cap_chan *chan);
these kind of changes that change the scope of a function deserve a
separate patch and proper commit message why we are doing it.
> #endif /* __L2CAP_H */
> diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
> new file mode 100644
> index 0000000..a5e9d17
> --- /dev/null
> +++ b/net/bluetooth/a2mp.c
> @@ -0,0 +1,91 @@
> +/*
> + Copyright (c) 2010-2011 Code Aurora Forum. All rights reserved.
> + Copyright (c) 2011 Intel Corp.
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License version 2 and
> + only version 2 as published by the Free Software Foundation.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + GNU General Public License for more details.
> +*/
> +
> +#include <net/bluetooth/bluetooth.h>
> +#include <net/bluetooth/l2cap.h>
> +
> +static void l2cap_fixed_channel_config(struct sock *sk)
> +{
> + struct l2cap_chan *chan = l2cap_pi(sk)->chan;
> +
> + lock_sock(sk);
> +
> + chan->omtu = L2CAP_A2MP_DEFAULT_MTU;
> + chan->imtu = L2CAP_A2MP_DEFAULT_MTU;
> + chan->flush_to = L2CAP_DEFAULT_FLUSH_TO;
> + chan->fcs = L2CAP_FCS_CRC16;
> +
> + chan->max_tx = 0xFF;
> + chan->remote_max_tx = chan->max_tx;
> +
> + /* Send 10 packets without ack */
> + chan->tx_win = 10;
> + chan->remote_tx_win = chan->tx_win;
> +
> + chan->remote_mps = chan->omtu;
> + chan->mps = chan->omtu;
> +
> + chan->retrans_timeout = L2CAP_DEFAULT_RETRANS_TO;
> + chan->monitor_timeout = L2CAP_DEFAULT_MONITOR_TO;
> +
> + skb_queue_head_init(&chan->tx_q);
> +
> + chan->mode = L2CAP_MODE_ERTM;
> + l2cap_ertm_init(chan);
> +
> + release_sock(sk);
> +}
> +
> +static struct socket *open_a2mp_sock(struct l2cap_conn *conn)
> +{
> + int err;
> + struct socket *sock;
> + struct sockaddr_l2 addr;
> + struct sock *sk;
> +
> + err = sock_create_kern(PF_BLUETOOTH, SOCK_SEQPACKET,
> + BTPROTO_L2CAP, &sock);
> + if (err) {
> + BT_ERR("sock_create_kern failed %d", err);
> + return NULL;
> + }
> +
> + sk = sock->sk;
> + memset(&addr, 0, sizeof(addr));
> + bacpy(&addr.l2_bdaddr, conn->src);
> + addr.l2_family = AF_BLUETOOTH;
> + addr.l2_cid = L2CAP_CID_A2MP;
> + err = kernel_bind(sock, (struct sockaddr *) &addr, sizeof(addr));
> + if (err) {
> + BT_ERR("kernel_bind failed %d", err);
> + sock_release(sock);
> + return NULL;
> + }
> +
> + l2cap_fixed_channel_config(sk);
> +
> + memset(&addr, 0, sizeof(addr));
> + bacpy(&addr.l2_bdaddr, conn->dst);
> + addr.l2_family = AF_BLUETOOTH;
> + addr.l2_cid = L2CAP_CID_A2MP;
> + err = kernel_connect(sock, (struct sockaddr *) &addr, sizeof(addr),
> + O_NONBLOCK);
> + if ((err == 0) || (err == -EINPROGRESS))
> + return sock;
> + else {
> + BT_ERR("kernel_connect failed %d", err);
> + sock_release(sock);
> + return NULL;
> + }
> +}
And now I am confused. So either we use the socket inside the kernel
directly or we make internal calls to L2CAP. However this looks like a
really weird mix between we do whatever we please.
If this is has a long term plan that I am not away, I like to see these
parts properly commented in the code. Otherwise we end up in a disaster
area later on.
Regards
Marcel
--
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
