Return-Path: Date: Fri, 9 Mar 2012 14:21:58 +0200 From: Andrei Emeltchenko To: santosh nayak Cc: marcel@holtmann.org, padovan@profusion.mobi, davem@davemloft.net, linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: Resend: [PATCH] Bluetooth: Fix Endian Bug. Message-ID: <20120309122154.GA17167@aemeltch-MOBL1> References: <1330622196-12967-1-git-send-email-santoshprasadnayak@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1330622196-12967-1-git-send-email-santoshprasadnayak@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: On Thu, Mar 01, 2012 at 10:46:36PM +0530, santosh nayak wrote: > From: Santosh Nayak > > Fix network to host endian conversion for L2CAP chan id. > > Signed-off-by: Santosh Nayak Acked-by: Andrei Emeltchenko > --- > net/bluetooth/l2cap_sock.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > 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); > if (err) > goto done; > > -- > 1.7.4.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/