aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo F. Padovan <gustavo@las.ic.unicamp.br>2009-08-23 23:45:20 -0400
committerMarcel Holtmann <marcel@holtmann.org>2009-08-24 04:05:05 -0400
commit1b7bf4edca0fdbad70c44e139f4cfebd6759de81 (patch)
treeb1440de411b2785427e8935fa4e8ae4dfd71a27b
parente686219a64fee9be9ce438dc3f040cd71ddd168a (diff)
Bluetooth: Use proper *_unaligned_le{16,32} helpers for L2CAP
Simplify more conversions to the right endian with the proper helpers. Signed-off-by: Gustavo F. Padovan <gustavo@las.ic.unicamp.br> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-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 efac637525f1..e5847c5849d7 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -2924,7 +2924,7 @@ static inline int l2cap_information_req(struct l2cap_conn *conn, struct l2cap_cm
2924 if (enable_ertm) 2924 if (enable_ertm)
2925 feat_mask |= L2CAP_FEAT_ERTM | L2CAP_FEAT_STREAMING 2925 feat_mask |= L2CAP_FEAT_ERTM | L2CAP_FEAT_STREAMING
2926 | L2CAP_FEAT_FCS; 2926 | L2CAP_FEAT_FCS;
2927 put_unaligned(cpu_to_le32(feat_mask), (__le32 *) rsp->data); 2927 put_unaligned_le32(feat_mask, rsp->data);
2928 l2cap_send_cmd(conn, cmd->ident, 2928 l2cap_send_cmd(conn, cmd->ident,
2929 L2CAP_INFO_RSP, sizeof(buf), buf); 2929 L2CAP_INFO_RSP, sizeof(buf), buf);
2930 } else if (type == L2CAP_IT_FIXED_CHAN) { 2930 } else if (type == L2CAP_IT_FIXED_CHAN) {
@@ -3572,7 +3572,7 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)
3572 break; 3572 break;
3573 3573
3574 case L2CAP_CID_CONN_LESS: 3574 case L2CAP_CID_CONN_LESS:
3575 psm = get_unaligned((__le16 *) skb->data); 3575 psm = get_unaligned_le16(skb->data);
3576 skb_pull(skb, 2); 3576 skb_pull(skb, 2);
3577 l2cap_conless_channel(conn, psm, skb); 3577 l2cap_conless_channel(conn, psm, skb);
3578 break; 3578 break;