| Message ID | 1330622196-12967-1-git-send-email-santoshprasadnayak@gmail.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
When you put "Resend:" in the subject it breaks git am. Git am is supposed to strip out the [PATCH] but the Resend confuses it. Put the subject as: [PATCH v3] Bluetooth: Fix Endian Bug. regards, dan carpenter
Hi Santosh, * santosh nayak <santoshprasadnayak@gmail.com> [2012-03-01 22:46:36 +0530]: > From: Santosh Nayak <santoshprasadnayak@gmail.com> > > Fix network to host endian conversion for L2CAP chan id. > > Signed-off-by: Santosh Nayak <santoshprasadnayak@gmail.com> > --- > 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)); This is kind weird, la.l2_cid comes from the user, so it is already in host endian. No need for convertions here. Gustavo -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Gustavo, > > Fix network to host endian conversion for L2CAP chan id. > > > > Signed-off-by: Santosh Nayak <santoshprasadnayak@gmail.com> > > --- > > 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)); > > This is kind weird, la.l2_cid comes from the user, so it is already in host > endian. No need for convertions here. CID and PSM are provided in little endian by user space. Regards Marcel -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Mar 01, 2012 at 10:46:36PM +0530, santosh nayak wrote: > From: Santosh Nayak <santoshprasadnayak@gmail.com> > > Fix network to host endian conversion for L2CAP chan id. > > Signed-off-by: Santosh Nayak <santoshprasadnayak@gmail.com> Acked-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com> > --- > 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/ -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Andrei, * santosh nayak <santoshprasadnayak@gmail.com> [2012-03-01 22:46:36 +0530]: > From: Santosh Nayak <santoshprasadnayak@gmail.com> > > Fix network to host endian conversion for L2CAP chan id. > > Signed-off-by: Santosh Nayak <santoshprasadnayak@gmail.com> > --- > net/bluetooth/l2cap_sock.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) Applied, thanks. Gustavo -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;