Re: [PATCH 09/12] Bluetooth: check for already existent channel before create new one

Andrei Emeltchenko
2012-05-25T07:32:19Z

Hi Gustavo,

On Thu, May 24, 2012 at 07:59:49PM -0300, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
>
> Move this check to before the channel time creation simplifies the code
> and avoid memory allocation if the channel already exist.
>
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

Acked-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>

> ---
> net/bluetooth/l2cap_core.c | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index 7719508..0df7f49 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -3340,21 +3340,16 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd
>
> result = L2CAP_CR_NO_MEM;
>
> + /* Check if we already have channel with that dcid */
> + if (__l2cap_get_chan_by_dcid(conn, scid))
> + goto response;
> +
> chan = pchan->ops->new_connection(pchan->data);
> if (!chan)
> goto response;
>
> sk = chan->sk;
>
> - /* Check if we already have channel with that dcid */
> - if (__l2cap_get_chan_by_dcid(conn, scid)) {
> - if (chan->ops->teardown)
> - chan->ops->teardown(chan->data, 0);
> -
> - chan->ops->close(chan->data);
> - goto response;
> - }
> -
> hci_conn_hold(conn->hcon);
>
> bacpy(&bt_sk(sk)->src, conn->src);
> --
> 1.7.10.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html