Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 203919
b: refs/heads/master
c: da5f6c3
h: refs/heads/master
i:
  203917: 3735ceb
  203915: af46eb4
  203911: cfbe85c
  203903: 922ad8b
v: v3
  • Loading branch information
Gustavo F. Padovan authored and Marcel Holtmann committed Jul 27, 2010
1 parent 190f716 commit fdf294c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0bbdf6cba0fb730ae2f2cfd5ead3d1e2e5498ddc
refs/heads/master: da5f6c37eee040775997191d1a1bc91c0c1e51eb
8 changes: 4 additions & 4 deletions trunk/net/bluetooth/hci_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1149,15 +1149,15 @@ int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count)
if (type < HCI_ACLDATA_PKT || type > HCI_EVENT_PKT)
return -EILSEQ;

do {
while (count) {
rem = hci_reassembly(hdev, type, data, count,
type - 1, GFP_ATOMIC);
if (rem < 0)
return rem;

data += (count - rem);
count = rem;
} while (count);
};

return rem;
}
Expand All @@ -1170,7 +1170,7 @@ int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count)
int type;
int rem = 0;

do {
while (count) {
struct sk_buff *skb = hdev->reassembly[STREAM_REASSEMBLY];

if (!skb) {
Expand All @@ -1192,7 +1192,7 @@ int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count)

data += (count - rem);
count = rem;
} while (count);
};

return rem;
}
Expand Down

0 comments on commit fdf294c

Please sign in to comment.