aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2010-10-18 14:25:53 -0200
committerGustavo F. Padovan <padovan@profusion.mobi>2010-11-09 00:56:09 -0200
commit4f8b691c9fb02e72359e71592098c1de3b8ec712 (patch)
treed74bf4427c1f92b79ba84e8c8159f02b3933430a /net
parentbfaaeb3ed5533a2dd38e3aa9ea43efd619690aed (diff)
downloadmrst-s0i3-test-4f8b691c9fb02e72359e71592098c1de3b8ec712.tar.gz
mrst-s0i3-test-4f8b691c9fb02e72359e71592098c1de3b8ec712.tar.xz
mrst-s0i3-test-4f8b691c9fb02e72359e71592098c1de3b8ec712.zip
Bluetooth: fix endianness conversion in L2CAP
Last commit added a wrong endianness conversion. Fixing that. Reported-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index b3fb02ab229..cd8f6ea0384 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -2452,11 +2452,11 @@ static void l2cap_add_conf_opt(void **ptr, u8 type, u8 len, unsigned long val)
break;
case 2:
- put_unaligned_le16(cpu_to_le16(val), opt->val);
+ put_unaligned_le16(val, opt->val);
break;
case 4:
- put_unaligned_le32(cpu_to_le32(val), opt->val);
+ put_unaligned_le32(val, opt->val);
break;
default: