From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753032AbcHMDPW (ORCPT ); Fri, 12 Aug 2016 23:15:22 -0400 Received: from mail.kernel.org ([198.145.29.136]:39752 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752979AbcHMDPT (ORCPT ); Fri, 12 Aug 2016 23:15:19 -0400 From: Sebastian Reichel To: Sebastian Reichel , Tony Lindgren , Rob Herring , Mark Rutland , Marcel Holtmann , Greg Kroah-Hartman , Jiri Slaby Cc: Ville Tervo , =?UTF-8?q?Filip=20Matijevi=C4=87?= , Aaro Koskinen , Pavel Machek , =?UTF-8?q?Pali=20Roh=C3=A1r?= , ivo.g.dimitrov.75@gmail.com, linux-bluetooth@vger.kernel.org, linux-serial@vger.kernel.org, linux-omap@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC 4/7] Bluetooth: hci_uart: Add support for word alignment Date: Sat, 13 Aug 2016 05:14:35 +0200 Message-Id: <1471058078-5579-5-git-send-email-sre@kernel.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1471058078-5579-1-git-send-email-sre@kernel.org> References: <1471058078-5579-1-git-send-email-sre@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This will be used by Nokia's H4+ protocol, which adds padding to packets to reach word alignment. --- drivers/bluetooth/hci_h4.c | 10 ++++++++++ drivers/bluetooth/hci_uart.h | 1 + 2 files changed, 11 insertions(+) diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c index 635597b6e168..a934e4eb692b 100644 --- a/drivers/bluetooth/hci_h4.c +++ b/drivers/bluetooth/hci_h4.c @@ -253,11 +253,21 @@ struct sk_buff *h4_recv_buf(struct hci_dev *hdev, struct sk_buff *skb, } if (!dlen) { + if ((&pkts[i])->wordaligned && !(skb->len % 2)) { + buffer++; + count--; + } + /* No more data, complete frame */ (&pkts[i])->recv(hdev, skb); skb = NULL; } } else { + if ((&pkts[i])->wordaligned && !(skb->len % 2)) { + buffer++; + count--; + } + /* Complete frame */ (&pkts[i])->recv(hdev, skb); skb = NULL; diff --git a/drivers/bluetooth/hci_uart.h b/drivers/bluetooth/hci_uart.h index 839bad1d8152..a7d67aec3632 100644 --- a/drivers/bluetooth/hci_uart.h +++ b/drivers/bluetooth/hci_uart.h @@ -121,6 +121,7 @@ struct h4_recv_pkt { u8 loff; /* Data length offset in header */ u8 lsize; /* Data length field size */ u16 maxlen; /* Max overall packet length */ + bool wordaligned; /* packets are word aligned */ int (*recv)(struct hci_dev *hdev, struct sk_buff *skb); }; -- 2.8.1