From: Gustavo F. Padovan <gustavo@las.ic.unicamp.br>
Date: Mon, 24 Aug 2009 03:45:20 +0000 (-0300)
Subject: Bluetooth: Use proper *_unaligned_le{16,32} helpers for L2CAP
X-Git-Tag: MMI-PSA29.97-13-9~26976^2~221^2~6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1b7bf4edca0fdbad70c44e139f4cfebd6759de81;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

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
 		if (enable_ertm)
 			feat_mask |= L2CAP_FEAT_ERTM | L2CAP_FEAT_STREAMING
 							 | L2CAP_FEAT_FCS;
-		put_unaligned(cpu_to_le32(feat_mask), (__le32 *) rsp->data);
+		put_unaligned_le32(feat_mask, rsp->data);
 		l2cap_send_cmd(conn, cmd->ident,
 					L2CAP_INFO_RSP, sizeof(buf), buf);
 	} else if (type == L2CAP_IT_FIXED_CHAN) {
@@ -3572,7 +3572,7 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)
 		break;
 
 	case L2CAP_CID_CONN_LESS:
-		psm = get_unaligned((__le16 *) skb->data);
+		psm = get_unaligned_le16(skb->data);
 		skb_pull(skb, 2);
 		l2cap_conless_channel(conn, psm, skb);
 		break;