git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
bluetooth
/
hci_sock.c
diff --git
a/net/bluetooth/hci_sock.c
b/net/bluetooth/hci_sock.c
index
316fa7a
..
dbf98c4
100644
(file)
--- a/
net/bluetooth/hci_sock.c
+++ b/
net/bluetooth/hci_sock.c
@@
-123,10
+123,10
@@
void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb)
if (flt->opcode &&
((evt == HCI_EV_CMD_COMPLETE &&
flt->opcode !=
if (flt->opcode &&
((evt == HCI_EV_CMD_COMPLETE &&
flt->opcode !=
- get_unaligned((__
u
16 *)(skb->data + 3))) ||
+ get_unaligned((__
le
16 *)(skb->data + 3))) ||
(evt == HCI_EV_CMD_STATUS &&
flt->opcode !=
(evt == HCI_EV_CMD_STATUS &&
flt->opcode !=
- get_unaligned((__
u
16 *)(skb->data + 4)))))
+ get_unaligned((__
le
16 *)(skb->data + 4)))))
continue;
}
continue;
}
@@
-621,7
+621,7
@@
static int hci_sock_create(struct socket *sock, int protocol)
sock->ops = &hci_sock_ops;
sock->ops = &hci_sock_ops;
- sk = sk_alloc(PF_BLUETOOTH, GFP_
KERNEL
, &hci_sk_proto, 1);
+ sk = sk_alloc(PF_BLUETOOTH, GFP_
ATOMIC
, &hci_sk_proto, 1);
if (!sk)
return -ENOMEM;
if (!sk)
return -ENOMEM;