2010-09-20 01:26:14

by haijun liu

Subject: [PATCH 1/2] Bluetooth: Remove duplicate code.

Remove duplicate code, it's already in l2cap_send_disconn_req().


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

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 725744b..076d1af 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -3222,7 +3222,6 @@ static inline int l2cap_config_rsp(struct
l2cap_conn *conn, struct l2cap_cmd_hdr
}

default:
- sk->sk_err = ECONNRESET;
l2cap_sock_set_timer(sk, HZ * 5);
l2cap_send_disconn_req(conn, sk, ECONNRESET);
goto done;
--
1.6.3.3


--
Haijun Liu

2010-09-21 05:41:12

by Ville Tervo

Subject: Re: [PATCH 1/2] Bluetooth: Remove duplicate code.

On Mon, Sep 20, 2010 at 03:26:14AM +0200, ext haijun liu wrote:
> Remove duplicate code, it's already in l2cap_send_disconn_req().
>
>
> Signed-off-by: Haijun.Liu <[email protected]>

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

> ---
> net/bluetooth/l2cap.c | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
> index 725744b..076d1af 100644
> --- a/net/bluetooth/l2cap.c
> +++ b/net/bluetooth/l2cap.c
> @@ -3222,7 +3222,6 @@ static inline int l2cap_config_rsp(struct
> l2cap_conn *conn, struct l2cap_cmd_hdr
> }
>
> default:
> - sk->sk_err = ECONNRESET;
> l2cap_sock_set_timer(sk, HZ * 5);
> l2cap_send_disconn_req(conn, sk, ECONNRESET);
> goto done;
> --
> 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