aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap_sock.c
diff options
context:
space:
mode:
authorSantosh Nayak <[email protected]>2012-03-01 17:16:36 +0000
committerGustavo Padovan <[email protected]>2012-03-28 15:02:26 +0000
commit6e4aff103774d6ee937a1dba9b1b4bf89100e7f6 (patch)
tree8d8a4302656c1547ab1a844725be452efb77a173 /net/bluetooth/l2cap_sock.c
parentBluetooth: Use correct flags for checking HCI_SSP_ENABLED bit (diff)
downloadkernel-6e4aff103774d6ee937a1dba9b1b4bf89100e7f6.tar.gz
kernel-6e4aff103774d6ee937a1dba9b1b4bf89100e7f6.zip
Bluetooth: Fix Endian Bug.
Fix network to host endian conversion for L2CAP chan id. Signed-off-by: Santosh Nayak <[email protected]> Acked-by: Andrei Emeltchenko <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
-rw-r--r--net/bluetooth/l2cap_sock.c5
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;