| Message ID | 1330599561-20392-1-git-send-email-santoshprasadnayak@gmail.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
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 -- 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
Andrei, I could not get you. Do you want me to resend the patch with subject, "[PATCH] Bluetooth: Fix network to host endian conversion for L2CAP chan id." ? regards santosh On Thu, Mar 1, 2012 at 6:05 PM, Andrei Emeltchenko <andrei.emeltchenko.news@gmail.com> wrote: > 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 > -- 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 Santosh, On Thu, Mar 01, 2012 at 07:34:58PM +0530, santosh prasad nayak wrote: > Andrei, > > I could not get you. > > Do you want me to resend the patch with subject, > "[PATCH] Bluetooth: Fix network to host endian conversion for L2CAP > chan id." ? No, the main concern was your commit message which is changelog and should come after "---" as it is shown in the example below. > > 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<---------------------------------------------------------- Best regards Andrei Emeltchenko -- 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;