redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

bluetooth: use get/put_unaligned_* helpers

Browse source 
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Harvey Harrison 2008-05-02 16:25:46 -07:00 committed by David S. Miller
parent 260ffeed3f
commit 8398531939
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net/bluetooth/bnep/core.c
View file

@ -135,7 +135,7 @@ static int bnep_ctrl_set_netfilter(struct bnep_session *s, __be16 *data, int len
if (len < 2) if (len < 2)
return -EILSEQ; return -EILSEQ;
n = ntohs(get_unaligned(data)); n = get_unaligned_be16(data);
data++; len -= 2; data++; len -= 2;
if (len < n) if (len < n)
@ -150,8 +150,8 @@ static int bnep_ctrl_set_netfilter(struct bnep_session *s, __be16 *data, int len
int i; int i;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
f[i].start = ntohs(get_unaligned(data++)); f[i].start = get_unaligned_be16(data++);
f[i].end = ntohs(get_unaligned(data++)); f[i].end = get_unaligned_be16(data++);
BT_DBG("proto filter start %d end %d", BT_DBG("proto filter start %d end %d",
f[i].start, f[i].end); f[i].start, f[i].end);
@ -180,7 +180,7 @@ static int bnep_ctrl_set_mcfilter(struct bnep_session *s, u8 *data, int len)
if (len < 2) if (len < 2)
return -EILSEQ; return -EILSEQ;
n = ntohs(get_unaligned((__be16 *) data)); n = get_unaligned_be16(data);
data += 2; len -= 2; data += 2; len -= 2;
if (len < n) if (len < n)

9
net/bluetooth/hci_event.c
View file

@ -129,8 +129,7 @@ static void hci_cc_write_link_policy(struct hci_dev *hdev, struct sk_buff *skb)
conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(rp->handle)); conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(rp->handle));
if (conn) { if (conn) {
__le16 policy = get_unaligned((__le16 *) (sent + 2)); conn->link_policy = get_unaligned_le16(sent + 2);
conn->link_policy = __le16_to_cpu(policy);
} }
hci_dev_unlock(hdev); hci_dev_unlock(hdev);
@ -313,7 +312,7 @@ static void hci_cc_write_voice_setting(struct hci_dev *hdev, struct sk_buff *skb
return; return;
if (!status) { if (!status) {
__u16 setting = __le16_to_cpu(get_unaligned((__le16 *) sent)); __u16 setting = get_unaligned_le16(sent);
if (hdev->voice_setting != setting) { if (hdev->voice_setting != setting) {
hdev->voice_setting = setting; hdev->voice_setting = setting;
@ -1152,8 +1151,8 @@ static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *s
struct hci_conn *conn; struct hci_conn *conn;
__u16 handle, count; __u16 handle, count;
handle = __le16_to_cpu(get_unaligned(ptr++)); handle = get_unaligned_le16(ptr++);
count = __le16_to_cpu(get_unaligned(ptr++)); count = get_unaligned_le16(ptr++);
conn = hci_conn_hash_lookup_handle(hdev, handle); conn = hci_conn_hash_lookup_handle(hdev, handle);
if (conn) { if (conn) {

2
net/bluetooth/hci_sock.c
View file

@ -440,7 +440,7 @@ static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
skb->dev = (void *) hdev; skb->dev = (void *) hdev;
if (bt_cb(skb)->pkt_type == HCI_COMMAND_PKT) { if (bt_cb(skb)->pkt_type == HCI_COMMAND_PKT) {
u16 opcode = __le16_to_cpu(get_unaligned((__le16 *) skb->data)); u16 opcode = get_unaligned_le16(skb->data);
u16 ogf = hci_opcode_ogf(opcode); u16 ogf = hci_opcode_ogf(opcode);
u16 ocf = hci_opcode_ocf(opcode); u16 ocf = hci_opcode_ocf(opcode);

2
net/bluetooth/l2cap.c
View file

@ -1827,7 +1827,7 @@ static inline int l2cap_information_rsp(struct l2cap_conn *conn, struct l2cap_cm
del_timer(&conn->info_timer); del_timer(&conn->info_timer);
if (type == L2CAP_IT_FEAT_MASK) if (type == L2CAP_IT_FEAT_MASK)
conn->feat_mask = __le32_to_cpu(get_unaligned((__le32 *) rsp->data)); conn->feat_mask = get_unaligned_le32(rsp->data);
l2cap_conn_start(conn); l2cap_conn_start(conn);