diff options
| author | Loic Poulain <loic.poulain@intel.com> | 2015-08-24 18:57:57 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2015-08-28 21:00:37 +0200 |
| commit | e54991677e1c8060ba5642472cbd9a0954298d01 (patch) | |
| tree | aec456ce4793e2fe12471fcaf2cd531588a7ae15 /drivers/bluetooth/hci_h4.c | |
| parent | 4e1795de10903ae561872c54a72fa1bcf78f49cd (diff) | |
| download | linux-stable-e54991677e1c8060ba5642472cbd9a0954298d01.tar.gz linux-stable-e54991677e1c8060ba5642472cbd9a0954298d01.tar.bz2 linux-stable-e54991677e1c8060ba5642472cbd9a0954298d01.zip | |
Bluetooth: hci_uart: Fix zero len data packet reception issue
Packets with a variable length value equal to zero were not received.
Since no more data expected (and input buffer entirely consumed), we
need to complete/forward the packet immediately instead of waiting for
more data.
Signed-off-by: Loic Poulain <loic.poulain@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth/hci_h4.c')
| -rw-r--r-- | drivers/bluetooth/hci_h4.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c index 57faddc53645..eec3f28e4bb9 100644 --- a/drivers/bluetooth/hci_h4.c +++ b/drivers/bluetooth/hci_h4.c @@ -223,8 +223,7 @@ struct sk_buff *h4_recv_buf(struct hci_dev *hdev, struct sk_buff *skb, switch ((&pkts[i])->lsize) { case 0: /* No variable data length */ - (&pkts[i])->recv(hdev, skb); - skb = NULL; + dlen = 0; break; case 1: /* Single octet variable length */ @@ -252,6 +251,12 @@ struct sk_buff *h4_recv_buf(struct hci_dev *hdev, struct sk_buff *skb, kfree_skb(skb); return ERR_PTR(-EILSEQ); } + + if (!dlen) { + /* No more data, complete frame */ + (&pkts[i])->recv(hdev, skb); + skb = NULL; + } } else { /* Complete frame */ (&pkts[i])->recv(hdev, skb); |