git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull battery into release branch
[sfrench/cifs-2.6.git]
/
net
/
bluetooth
/
hci_core.c
diff --git
a/net/bluetooth/hci_core.c
b/net/bluetooth/hci_core.c
index f6d867e0179f3e3cd1692161997d1abeb49948dc..63caa414945de3b68e728f7d29fba7f8e7c63bb5 100644
(file)
--- a/
net/bluetooth/hci_core.c
+++ b/
net/bluetooth/hci_core.c
@@
-982,7
+982,7
@@
int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count)
skb->dev = (void *) hdev;
bt_cb(skb)->pkt_type = type;
-
+
__reassembly(hdev, type) = skb;
scb = (void *) skb->cb;