diff options
| author | Santosh Nayak <santoshprasadnayak@gmail.com> | 2012-03-01 22:46:36 +0530 |
|---|---|---|
| committer | Gustavo Padovan <gustavo@padovan.org> | 2012-03-28 12:02:26 -0300 |
| commit | 6e4aff103774d6ee937a1dba9b1b4bf89100e7f6 (patch) | |
| tree | 8d8a4302656c1547ab1a844725be452efb77a173 /net | |
| parent | 3f17790c2d8524c3ddc4946bd716714becf079e1 (diff) | |
| download | linux-stable-6e4aff103774d6ee937a1dba9b1b4bf89100e7f6.tar.gz linux-stable-6e4aff103774d6ee937a1dba9b1b4bf89100e7f6.tar.bz2 linux-stable-6e4aff103774d6ee937a1dba9b1b4bf89100e7f6.zip | |
Bluetooth: Fix Endian Bug.
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>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net')
| -rw-r--r-- | 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 c4fe583b0af6..29122ed28ea9 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) return err; |