lkml.org 
[lkml]   [2012]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: Resend: [PATCH] Bluetooth: Fix Endian Bug.
Hi Santosh,

On Thu, Mar 01, 2012 at 04:29:21PM +0530, santosh nayak wrote:
> From: Santosh Nayak <santoshprasadnayak@gmail.com>
>
> Fix for endian bug.
>
> Fix for null dereferenced removed as it is already
> submitted by Andrei.
>
> Signed-off-by: Santosh Nayak <santoshprasadnayak@gmail.com>
> ---
> net/bluetooth/l2cap_sock.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)

We prefer following commit log (this is the example)

<------8<----------------------------------------------------------
| From: Santosh Nayak <santoshprasadnayak@gmail.com>
|
| Fix network to host endian conversion for L2CAP chan id.
|
| Signed-off-by: Santosh Nayak <santoshprasadnayak@gmail.com>
|
| ---
| * v2 Fix for null dereferenced removed as it is already
| submitted by Andrei.
|
| net/bluetooth/l2cap_sock.c | 5 +++--
| 1 files changed, 3 insertions(+), 2 deletions(-)
|
<------8<----------------------------------------------------------


>
> diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
> index 401d942..86d5067 100644
> --- a/net/bluetooth/l2cap_sock.c
> +++ b/net/bluetooth/l2cap_sock.c
> @@ -82,7 +82,7 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
> }
>
> if (la.l2_cid)
> - err = l2cap_add_scid(chan, la.l2_cid);
> + err = l2cap_add_scid(chan, __le16_to_cpu(la.l2_cid));
> else
> err = l2cap_add_psm(chan, &la.l2_bdaddr, la.l2_psm);
>
> @@ -123,7 +123,8 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int al
> if (la.l2_cid && la.l2_psm)
> return -EINVAL;
>
> - err = l2cap_chan_connect(chan, la.l2_psm, la.l2_cid, &la.l2_bdaddr);
> + err = l2cap_chan_connect(chan, la.l2_psm, __le16_to_cpu(la.l2_cid),
> + &la.l2_bdaddr);

I live this to Marcel to decide should we reindent our code otherwise this
one looks odd.

Best regards
Andrei Emeltchenko



\
 
 \ /
  Last update: 2012-03-01 13:39    [W:0.050 / U:0.408 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site