2010-09-20 01:33:31

by haijun liu

[permalink] [raw]
Subject: [PATCH 2/2] Bluetooth: Update conf_state before send config_req out.

Update conf_state with L2CAP_CONF_REQ_SENT before send config_req out.


Signed-off-by: Haijun.Liu <[email protected]>
---
net/bluetooth/l2cap.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 076d1af..9d1225d 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -3164,6 +3164,7 @@ static inline int l2cap_config_req(struct
l2cap_conn *conn, struct l2cap_cmd_hdr
u8 buf[64];
+ l2cap_pi(sk)->conf_state |= L2CAP_CONF_REQ_SENT;
l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_CONF_REQ,
l2cap_build_conf_req(sk, buf), buf);
l2cap_pi(sk)->num_conf_req++;
}

--
1.6.3.3


--
Haijun Liu


2010-09-30 07:23:29

by Gustavo Padovan

[permalink] [raw]
Subject: Re: [PATCH 2/2] Bluetooth: Update conf_state before send config_req out.

Hi Haijun,

* haijun liu <[email protected]> [2010-09-29 19:11:29 +0800]:

> Update conf_state with L2CAP_CONF_REQ_SENT before send
> config_req out in l2cap_config_req().
>
>
> Signed-off-by: Haijun.Liu <[email protected]>
> ---
> net/bluetooth/l2cap_core.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)

Still corrupted:

Applying: Bluetooth: Update conf_state before send config_req out.
fatal: corrupt patch at line 10
Patch failed at 0001 Bluetooth: Update conf_state before send config_req
out.

Make sure you can apply your patches sent with git send-email before
sending them to the mailing list. Thanks.

--
Gustavo F. Padovan
ProFUSION embedded systems - http://profusion.mobi

2010-09-29 11:11:29

by haijun liu

[permalink] [raw]
Subject: Re: [PATCH 2/2] Bluetooth: Update conf_state before send config_req out.

Update conf_state with L2CAP_CONF_REQ_SENT before send
config_req out in l2cap_config_req().


Signed-off-by: Haijun.Liu <[email protected]>
---
net/bluetooth/l2cap_core.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index bef5c9f..f461fee 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -3026,6 +3026,7 @@ static inline int l2cap_config_req(struct
l2cap_conn *conn, struct l2cap_cmd_hdr

if (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_REQ_SENT)) {
u8 buf[64];
+ l2cap_pi(sk)->conf_state |= L2CAP_CONF_REQ_SENT;
l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_CONF_REQ,
l2cap_build_conf_req(sk, buf), buf);
l2cap_pi(sk)->num_conf_req++;
--
1.6.3.3

2010-09-28 23:49:34

by Gustavo Padovan

[permalink] [raw]
Subject: Re: [PATCH 2/2] Bluetooth: Update conf_state before send config_req out.

Hi Haijun,

* haijun liu <[email protected]> [2010-09-20 09:33:31 +0800]:

> Update conf_state with L2CAP_CONF_REQ_SENT before send config_req out.
>
>
> Signed-off-by: Haijun.Liu <[email protected]>

Both patches are corrupted, please fix that and rebase it against
http://git.kernel.org/?p=linux/kernel/git/padovan/bluetooth-next-2.6.git
Thanks.

--
Gustavo F. Padovan
ProFUSION embedded systems - http://profusion.mobi

2010-09-21 06:05:55

by Ville Tervo

[permalink] [raw]
Subject: Re: [PATCH 2/2] Bluetooth: Update conf_state before send config_req out.

On Mon, Sep 20, 2010 at 03:33:31AM +0200, ext haijun liu wrote:
> Update conf_state with L2CAP_CONF_REQ_SENT before send config_req out.
>
>
> Signed-off-by: Haijun.Liu <[email protected]>

Acked-by: Ville Tervo <[email protected]>

> ---
> net/bluetooth/l2cap.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
> index 076d1af..9d1225d 100644
> --- a/net/bluetooth/l2cap.c
> +++ b/net/bluetooth/l2cap.c
> @@ -3164,6 +3164,7 @@ static inline int l2cap_config_req(struct
> l2cap_conn *conn, struct l2cap_cmd_hdr
> u8 buf[64];
> + l2cap_pi(sk)->conf_state |= L2CAP_CONF_REQ_SENT;
> l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_CONF_REQ,
> l2cap_build_conf_req(sk, buf), buf);
> l2cap_pi(sk)->num_conf_req++;
> }
>
> --
> 1.6.3.3
>
>
> --
> Haijun Liu
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html