From 6edb7067ed933ce96736df5e0aa321c1aff2cfe3 Mon Sep 17 00:00:00 2001 From: Chris Lew Date: Tue, 1 May 2018 13:18:27 -0700 Subject: [PATCH] net: qrtr: Align header and payload Remote IPC Router drivers expect the received packet to be aligned. This case is only exposed using the MHI transport because it does not ensure the packet will be received as one chunk like RPMSG GLINK. Change-Id: I0e5c27e3c5896e6721c8bbbfcda29551f0968626 Signed-off-by: Chris Lew --- net/qrtr/qrtr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c index 038e77d40842..f132d5c39e93 100644 --- a/net/qrtr/qrtr.c +++ b/net/qrtr/qrtr.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2015, Sony Mobile Communications Inc. - * Copyright (c) 2013, The Linux Foundation. All rights reserved. + * Copyright (c) 2013, 2018 The Linux Foundation. All rights reserved. */ #include #include @@ -358,7 +358,7 @@ static int qrtr_node_enqueue(struct qrtr_node *node, struct sk_buff *skb, hdr->size = cpu_to_le32(len); hdr->confirm_rx = !!confirm_rx; - skb_put_padto(skb, ALIGN(len, 4)); + skb_put_padto(skb, ALIGN(len, 4) + sizeof(*hdr)); mutex_lock(&node->ep_lock); if (node->ep)