From patchwork Wed Jan 3 21:43:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Subash Abhinov Kasiviswanathan X-Patchwork-Id: 855277 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="BbbVcVqn"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="BbbVcVqn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zBkyQ1xJzz9s7c for ; Thu, 4 Jan 2018 08:46:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751422AbeACVpz (ORCPT ); Wed, 3 Jan 2018 16:45:55 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:57464 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751401AbeACVpx (ORCPT ); Wed, 3 Jan 2018 16:45:53 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id F1FAE60850; Wed, 3 Jan 2018 21:45:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1515015952; bh=lQ9XdPosSNUNfOCRim3hWLgHru/DBw4WlU6LKkUfu9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BbbVcVqnTbb6cijYLOfHdPkDGZTfBbraE/fX6I7+GGE8hfa2jaaZMDFx6Hacw0D3j VMXqoxNLO5bgMVxvhOJN6JY/aNkaqruyUSfBp00qIGyHQX8x4c67M70HmMCUhcGjas kYKOxpammEtiyvbXeP10CXeDdrbVFgViE9qW2rek= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from subashab-lnx.qualcomm.com (unknown [129.46.15.92]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: subashab@codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 022E060850; Wed, 3 Jan 2018 21:45:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1515015952; bh=lQ9XdPosSNUNfOCRim3hWLgHru/DBw4WlU6LKkUfu9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BbbVcVqnTbb6cijYLOfHdPkDGZTfBbraE/fX6I7+GGE8hfa2jaaZMDFx6Hacw0D3j VMXqoxNLO5bgMVxvhOJN6JY/aNkaqruyUSfBp00qIGyHQX8x4c67M70HmMCUhcGjas kYKOxpammEtiyvbXeP10CXeDdrbVFgViE9qW2rek= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 022E060850 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=subashab@codeaurora.org From: Subash Abhinov Kasiviswanathan To: davem@davemloft.net, netdev@vger.kernel.org, lkp@intel.com Cc: Subash Abhinov Kasiviswanathan Subject: [PATCH net-next v2 08/10] net: qualcomm: rmnet: Handle command packets with checksum trailer Date: Wed, 3 Jan 2018 14:43:05 -0700 Message-Id: <1515015787-6713-9-git-send-email-subashab@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1515015787-6713-1-git-send-email-subashab@codeaurora.org> References: <1515015787-6713-1-git-send-email-subashab@codeaurora.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When using the MAPv4 packet format in conjunction with MAP commands, a dummy DL checksum trailer will be appended to the packet. Before this packet is sent out as an ACK, the DL checksum trailer needs to be removed. Signed-off-by: Subash Abhinov Kasiviswanathan --- drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c index 51e6049..6bc328f 100644 --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c @@ -58,11 +58,24 @@ static u8 rmnet_map_do_flow_control(struct sk_buff *skb, } static void rmnet_map_send_ack(struct sk_buff *skb, - unsigned char type) + unsigned char type, + struct rmnet_port *port) { struct rmnet_map_control_command *cmd; int xmit_status; + if (port->data_format & RMNET_INGRESS_FORMAT_MAP_CKSUMV4) { + if (skb->len < sizeof(struct rmnet_map_header) + + RMNET_MAP_GET_LENGTH(skb) + + sizeof(struct rmnet_map_dl_csum_trailer)) { + kfree_skb(skb); + return; + } + + skb_trim(skb, skb->len - + sizeof(struct rmnet_map_dl_csum_trailer)); + } + skb->protocol = htons(ETH_P_MAP); cmd = RMNET_MAP_GET_CMD_START(skb); @@ -100,5 +113,5 @@ void rmnet_map_command(struct sk_buff *skb, struct rmnet_port *port) break; } if (rc == RMNET_MAP_COMMAND_ACK) - rmnet_map_send_ack(skb, rc); + rmnet_map_send_ack(skb, rc, port); }